From 35be7e24498a3e1b143a213643a5d8d86bdc4e13 Mon Sep 17 00:00:00 2001
From: 钟日健 <arsn163@163.com>
Date: Thu, 30 Oct 2025 19:40:22 +0800
Subject: [PATCH] fix: 报名年龄调整
---
src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java | 106 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 91 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
index 6780ebc..5c93104 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
@@ -10,6 +10,7 @@
import net.sourceforge.pinyin4j.format.HanyuPinyinToneType;
import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination;
import org.apache.commons.lang3.StringUtils;
+import org.springblade.common.constant.AgeConstant;
import org.springblade.common.constant.AgeUtil;
import org.springblade.common.utils.FtpSyncUtil;
import org.springblade.core.excel.util.ExcelUtil;
@@ -25,11 +26,17 @@
import org.springblade.modules.exam.service.ExamPaperService;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.service.MyAsyncService;
+import org.springblade.modules.system.vo.UserVO;
import org.springblade.modules.training.entity.TrainingRegistration;
import org.springblade.modules.training.excel.TrainingRegistrationExcel;
import org.springblade.modules.training.excel.TrainingRegistrationImporter;
import org.springblade.modules.training.service.TrainingRegistrationService;
import org.springblade.modules.training.vo.TrainingRegistrationVo;
+import org.springblade.modules.vip.service.UserVipService;
+import org.springblade.modules.vip.service.VipTopicService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -55,6 +62,12 @@
private final ExamPaperService examPaperService;
+ private final UserVipService userVipService;
+
+ private final VipTopicService vipTopicService;
+ private final MyAsyncService myAsyncService;
+
+
/**
* 自定义分页
* @param query page,size
@@ -74,7 +87,7 @@
@ApiOperation(value = "新增", notes = "传入trainingRegistration")
public R save(@RequestBody TrainingRegistration trainingRegistration){
//查询人员是否已报名
- User user = userService.getById(trainingRegistration.getUserId());
+ User user = userService.getUserById(trainingRegistration.getUserId());
if (null==user.getIsTrain()){
//已报名
trainingRegistration.setCancel(1);
@@ -157,7 +170,8 @@
+ "," + "'" + trainingRegistration.getIsExam() + "'"
+ "," +"'" + trainingRegistration.getAuditStatus() + "'" + ");" +
"update blade_user set is_train = " + user1.getIsTrain() + " " +"where id = " + "'" + user1.getId() + "'";
- FtpUtil.sqlFileUpload(sql);
+ //FtpUtil.sqlFileUpload(sql);
+ myAsyncService.dataSync(sql);
}
@@ -168,7 +182,8 @@
@PostMapping("/cancelTrain")
public R cancelApply(@RequestBody TrainingRegistration trainingRegistration){
//查询人员是否已报名
- User user = userService.getById(trainingRegistration.getUserId());
+ User user = userService.getUserById(trainingRegistration.getUserId());
+
if(null==user.getIsTrain()){
trainingRegistration.setCancel(2);
boolean status = trainingRegistrationService.updateById(trainingRegistration);
@@ -211,7 +226,7 @@
@PostMapping("/auditSucess")
public R auditSucess(@RequestBody TrainingRegistration trainingRegistration){
//查询人员信息
- User user = userService.getById(trainingRegistration.getUserId());
+ User user = userService.getUserById(trainingRegistration.getUserId());
boolean status = false;
if (null!=user){
//修改为已报名状态
@@ -236,7 +251,7 @@
@PostMapping("/cancelTrainAudit")
public R cancelApplyAudit(@RequestBody TrainingRegistration trainingRegistration){
//查询人员是否已报名
- User user = userService.getById(trainingRegistration.getUserId());
+ User user = userService.getUserById(trainingRegistration.getUserId());
if(null==user.getIsTrain()){
trainingRegistration.setCancel(2);
trainingRegistration.setAuditStatus(2);
@@ -285,7 +300,8 @@
",audit_status = " + "'" + trainingRegistration.getAuditStatus() + "'" +
" " +"where id = " + "'" + trainingRegistration.getId() + "';" +
"update blade_user set is_train = " + user.getIsTrain() + " " +"where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(s);
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.dataSync(s);
}
/**
@@ -301,10 +317,10 @@
// AtomicReference<StringBuilder> builder = new AtomicReference<>(new StringBuilder());
//遍历
list.forEach(userId ->{
- User user = userService.getById(userId);
+ User user = userService.getUserById(userId);
+ UserVO userVO = userService.getUserAgeById(Long.parseLong(userId));
//判断年龄
- Integer age = AgeUtil.idCardToAge(user.getCardid());
- if (age>=18 && age<=60) {
+ if (userVO.getAge()>= AgeConstant.APPLY_MIN_AGE && userVO.getAge() <= AgeConstant.APPLY_MAX_AGE) {
//未报名的新增，已报名的不做处理
if (null == user.getIsTrain()) {
TrainingRegistration trainingRegistration1 = new TrainingRegistration();
@@ -359,7 +375,7 @@
//如果存在年龄不符的，则抛出异常
if (count.get()>0){
String errorAccount = StringUtils.join(errorList, "\\\n");
- throw new ServiceException("保安员:[" + errorAccount + "]报名失败!年龄不符,报名年龄为[18-60]周岁!");
+ throw new ServiceException("保安员:[" + errorAccount + "]报名失败!年龄不符,报名年龄为[" + AgeConstant.APPLY_MIN_AGE + "-"+ AgeConstant.APPLY_MAX_AGE + "]周岁!");
}
return R.data(200,"报名成功");
}
@@ -618,7 +634,8 @@
"," + "'" + examPaper.getCreator() +"'" +
"," + "'" + creatorTimeFormat +"'" +
"," +"'" + examPaper.getAuditStatus() + "'" + ")";
- FtpUtil.sqlFileUpload(s);
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.dataSync(s);
//修改报名信息
@@ -633,7 +650,8 @@
"update sys_training_registration set train_exam_id = " + "'" + trainingRegistration.getTrainExamId() + "'"
+ ",audit_status = " + "'" + trainingRegistration.getAuditStatus() + "'"
+ " " + "where id = " + "'" + trainingRegistration.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
}
});
}
@@ -664,7 +682,7 @@
int year = instance.get(Calendar.YEAR);
int month = instance.get(Calendar.MONTH)+1;
int day = instance.get(Calendar.DAY_OF_MONTH);
- String examName = year + "年" + month+ "月"+ day +"日" +"保安员证培训考试";
+ String examName = year + "年" + month+ "月"+ day +"日" +"保安员证考试";
//考试名称
examPaper.setExamName(examName);
//考试申请人
@@ -689,7 +707,8 @@
"," + "'" + examPaper.getCreator() +"'" +
"," + "'" + creatorTimeFormat +"'" +
"," +"'" + examPaper.getAuditStatus() + "'" + ")";
- FtpUtil.sqlFileUpload(s);
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.dataSync(s);
//修改报名信息
list.forEach(id ->{
@@ -706,11 +725,68 @@
"update sys_training_registration set train_exam_id = " + "'" + trainingRegistration.getTrainExamId() + "'"
+ ",audit_status = " + "'" + trainingRegistration.getAuditStatus() + "'"
+ " " + "where id = " + "'" + trainingRegistration.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
}
}
});
}
return null;
}
+
+
+ /**
+ * 是否为会员标记
+ * @param trainingRegistration
+ * @return
+ */
+ @PostMapping("/vipSign")
+ @Transactional(rollbackFor = Exception.class)
+ public R vipSign(@RequestBody TrainingRegistration trainingRegistration){
+ //新增会员记录
+ userVipService.insertUserVipInfo(trainingRegistration);
+ //新增会员题库记录
+ vipTopicService.insertVipTopicInfo(trainingRegistration);
+ //内网报名信息同步
+ String s1 =
+ "update sys_training_registration set vip_status = " + "'" + trainingRegistration.getVipStatus() + "'"
+ + " " + "where id = " + "'" + trainingRegistration.getId() + "'";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
+ //更新并返回数据
+ return R.data(trainingRegistrationService.updateById(trainingRegistration));
+ }
+
+ /**
+ * 批量将已报名人员标记为已缴费
+ * @param trainingRegistration
+ * @return
+ */
+ @PostMapping("/vipSignBatch")
+ @Transactional(rollbackFor = Exception.class)
+ public R vipSignBatch(@RequestBody TrainingRegistrationVo trainingRegistration){
+ //查询已报名，未考试的报名信息
+ List<TrainingRegistration> trainingRegistrationList = trainingRegistrationService.getList(trainingRegistration);
+ if (trainingRegistrationList.size()>0){
+ for (TrainingRegistration registration : trainingRegistrationList) {
+ if (registration.getVipStatus().equals(2)) {
+ registration.setVipStatus(1);
+ //新增会员记录
+ userVipService.insertUserVipInfo(registration);
+ //新增会员题库记录
+ vipTopicService.insertVipTopicInfo(registration);
+ //内网报名信息同步
+ String s1 =
+ "update sys_training_registration set vip_status = " + "'" + registration.getVipStatus() + "'"
+ + " " + "where id = " + "'" + registration.getId() + "'";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
+ //更新
+ trainingRegistrationService.updateById(registration);
+ }
+ }
+ }
+ //返回数据
+ return R.data(true);
+ }
}
--
Gitblit v1.9.3