From 62eb499b0c969f246d3245d1429a97da4de1ce28 Mon Sep 17 00:00:00 2001
From: 钟日健 <arsn163@163.com>
Date: Mon, 01 Jun 2026 20:46:13 +0800
Subject: [PATCH] feat: 成绩查询增加年龄查询返回
---
src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 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 3614e63..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;
@@ -86,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);
@@ -170,7 +171,7 @@
+ "," +"'" + trainingRegistration.getAuditStatus() + "'" + ");" +
"update blade_user set is_train = " + user1.getIsTrain() + " " +"where id = " + "'" + user1.getId() + "'";
//FtpUtil.sqlFileUpload(sql);
- myAsyncService.FTP(sql);
+ myAsyncService.dataSync(sql);
}
@@ -181,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);
@@ -224,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){
//修改为已报名状态
@@ -249,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);
@@ -299,7 +301,7 @@
" " +"where id = " + "'" + trainingRegistration.getId() + "';" +
"update blade_user set is_train = " + user.getIsTrain() + " " +"where id = " + "'" + user.getId() + "'";
//FtpUtil.sqlFileUpload(s);
- myAsyncService.FTP(s);
+ myAsyncService.dataSync(s);
}
/**
@@ -315,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));
//判断年龄
- if (userVO.getAge()>=18 && userVO.getAge()<=60) {
+ if (userVO.getAge()>= AgeConstant.APPLY_MIN_AGE && userVO.getAge() <= AgeConstant.APPLY_MAX_AGE) {
//未报名的新增，已报名的不做处理
if (null == user.getIsTrain()) {
TrainingRegistration trainingRegistration1 = new TrainingRegistration();
@@ -373,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,"报名成功");
}
@@ -633,7 +635,7 @@
"," + "'" + creatorTimeFormat +"'" +
"," +"'" + examPaper.getAuditStatus() + "'" + ")";
//FtpUtil.sqlFileUpload(s);
- myAsyncService.FTP(s);
+ myAsyncService.dataSync(s);
//修改报名信息
@@ -649,7 +651,7 @@
+ ",audit_status = " + "'" + trainingRegistration.getAuditStatus() + "'"
+ " " + "where id = " + "'" + trainingRegistration.getId() + "'";
//FtpUtil.sqlFileUpload(s1);
- myAsyncService.FTP(s1);
+ myAsyncService.dataSync(s1);
}
});
}
@@ -680,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);
//考试申请人
@@ -706,7 +708,7 @@
"," + "'" + creatorTimeFormat +"'" +
"," +"'" + examPaper.getAuditStatus() + "'" + ")";
//FtpUtil.sqlFileUpload(s);
- myAsyncService.FTP(s);
+ myAsyncService.dataSync(s);
//修改报名信息
list.forEach(id ->{
@@ -724,7 +726,7 @@
+ ",audit_status = " + "'" + trainingRegistration.getAuditStatus() + "'"
+ " " + "where id = " + "'" + trainingRegistration.getId() + "'";
//FtpUtil.sqlFileUpload(s1);
- myAsyncService.FTP(s1);
+ myAsyncService.dataSync(s1);
}
}
});
@@ -750,7 +752,7 @@
"update sys_training_registration set vip_status = " + "'" + trainingRegistration.getVipStatus() + "'"
+ " " + "where id = " + "'" + trainingRegistration.getId() + "'";
//FtpUtil.sqlFileUpload(s1);
- myAsyncService.FTP(s1);
+ myAsyncService.dataSync(s1);
//更新并返回数据
return R.data(trainingRegistrationService.updateById(trainingRegistration));
}
@@ -778,7 +780,7 @@
"update sys_training_registration set vip_status = " + "'" + registration.getVipStatus() + "'"
+ " " + "where id = " + "'" + registration.getId() + "'";
//FtpUtil.sqlFileUpload(s1);
- myAsyncService.FTP(s1);
+ myAsyncService.dataSync(s1);
//更新
trainingRegistrationService.updateById(registration);
}
--
Gitblit v1.9.3