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 | 294 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 239 insertions(+), 55 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 c06adb3..5c93104 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
@@ -9,8 +9,12 @@
import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
import net.sourceforge.pinyin4j.format.HanyuPinyinToneType;
import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination;
-import org.springblade.common.utils.arg;
+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;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
@@ -18,29 +22,29 @@
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.apply.entity.Apply;
-import org.springblade.modules.apply.excel.ApplyImporter;
-import org.springblade.modules.apply.excel.ApplyInfoExcel;
-import org.springblade.modules.apply.vo.ApplyVO;
import org.springblade.modules.exam.entity.ExamPaper;
-import org.springblade.modules.exam.entity.ExamScore;
-import org.springblade.modules.exam.excel.ExamScoreExcel;
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.training.entity.TrainExam;
+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.TrainExamService;
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;
import javax.servlet.http.HttpServletResponse;
-import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
/**
* @author zhongrj
@@ -57,6 +61,12 @@
private final IUserService userService;
private final ExamPaperService examPaperService;
+
+ private final UserVipService userVipService;
+
+ private final VipTopicService vipTopicService;
+ private final MyAsyncService myAsyncService;
+
/**
* 自定义分页
@@ -77,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);
@@ -130,10 +140,10 @@
/**
* 报名
*/
- private void saveTrainingRegistration(TrainingRegistration trainingRegistration,User user1){
+ private StringBuilder batchSaveTrainingRegistration(TrainingRegistration trainingRegistration,User user1,StringBuilder builder){
String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
Long id = trainingRegistration.getId();
- String s = "insert into sys_training_registration(id,training_unit_id,training_time,cancel,user_id,is_exam,audit_status) " +
+ String sql = "insert into sys_training_registration(id,training_unit_id,training_time,cancel,user_id,is_exam,audit_status) " +
"values(" + "'" + id + "'"
+ "," + "'" + trainingRegistration.getTrainingUnitId() +"'"
+ "," + "'" + formatStr +"'"
@@ -142,7 +152,26 @@
+ "," + "'" + trainingRegistration.getIsExam() + "'"
+ "," +"'" + trainingRegistration.getAuditStatus() + "'" + ");" +
"update blade_user set is_train = " + user1.getIsTrain() + " " +"where id = " + "'" + user1.getId() + "'";
- FtpUtil.sqlFileUpload(s);
+ return FtpSyncUtil.sqlHandler(builder, sql,500);
+ }
+
+ /**
+ * 报名
+ */
+ private void saveTrainingRegistration(TrainingRegistration trainingRegistration,User user1){
+ String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+ Long id = trainingRegistration.getId();
+ String sql = "insert into sys_training_registration(id,training_unit_id,training_time,cancel,user_id,is_exam,audit_status) " +
+ "values(" + "'" + id + "'"
+ + "," + "'" + trainingRegistration.getTrainingUnitId() +"'"
+ + "," + "'" + formatStr +"'"
+ + "," + "'" + trainingRegistration.getCancel() + "'"
+ + "," + "'" + trainingRegistration.getUserId() + "'"
+ + "," + "'" + trainingRegistration.getIsExam() + "'"
+ + "," +"'" + trainingRegistration.getAuditStatus() + "'" + ");" +
+ "update blade_user set is_train = " + user1.getIsTrain() + " " +"where id = " + "'" + user1.getId() + "'";
+ //FtpUtil.sqlFileUpload(sql);
+ myAsyncService.dataSync(sql);
}
@@ -153,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);
@@ -181,13 +211,9 @@
if (status){
return R.data(200,"取消报名成功");
}
-
-
-
}else {
return R.data(201,"尚未报名");
}
-
}
return R.data(202,"取消报名失败");
}
@@ -200,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){
//修改为已报名状态
@@ -225,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);
@@ -274,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);
}
/**
@@ -284,28 +311,18 @@
@PostMapping("/batchTrain")
public R batchApply(@RequestBody TrainingRegistrationVo trainingRegistration){
List<String> list = Arrays.asList(trainingRegistration.getUserIds().split(","));
+ AtomicInteger count = new AtomicInteger();
+ //创建年龄部分对象集合
+ List<String> errorList = new ArrayList<>();
+// AtomicReference<StringBuilder> builder = new AtomicReference<>(new StringBuilder());
+ //遍历
list.forEach(userId ->{
- User user = userService.getById(userId);
- //未报名的新增，已报名的不做处理
- if (null==user.getIsTrain()) {
- TrainingRegistration trainingRegistration1 = new TrainingRegistration();
- trainingRegistration1.setCancel(1);
- //默认为未考试状态
- trainingRegistration1.setIsExam(1);
- //未提交考试审核
- trainingRegistration1.setAuditStatus(4);
- trainingRegistration1.setTrainingTime(new Date());
- trainingRegistration1.setUserId(userId);
- trainingRegistration1.setTrainingUnitId(trainingRegistration.getTrainingUnitId());
- trainingRegistrationService.save(trainingRegistration1);
- //修改保安报名状态
- user.setIsTrain(1);
- userService.updateById(user);
-
- //数据同步
- saveTrainingRegistration(trainingRegistration1,user);
- }else {
- if (user.getIsTrain()!=1) {
+ User user = userService.getUserById(userId);
+ UserVO userVO = userService.getUserAgeById(Long.parseLong(userId));
+ //判断年龄
+ if (userVO.getAge()>= AgeConstant.APPLY_MIN_AGE && userVO.getAge() <= AgeConstant.APPLY_MAX_AGE) {
+ //未报名的新增，已报名的不做处理
+ if (null == user.getIsTrain()) {
TrainingRegistration trainingRegistration1 = new TrainingRegistration();
trainingRegistration1.setCancel(1);
//默认为未考试状态
@@ -322,9 +339,44 @@
//数据同步
saveTrainingRegistration(trainingRegistration1,user);
+// builder.set(batchSaveTrainingRegistration(trainingRegistration1, user, builder.get()));
+ } else {
+ if (user.getIsTrain() != 1) {
+ TrainingRegistration trainingRegistration1 = new TrainingRegistration();
+ trainingRegistration1.setCancel(1);
+ //默认为未考试状态
+ trainingRegistration1.setIsExam(1);
+ //未提交考试审核
+ trainingRegistration1.setAuditStatus(4);
+ trainingRegistration1.setTrainingTime(new Date());
+ trainingRegistration1.setUserId(userId);
+ trainingRegistration1.setTrainingUnitId(trainingRegistration.getTrainingUnitId());
+ trainingRegistrationService.save(trainingRegistration1);
+ //修改保安报名状态
+ user.setIsTrain(1);
+ userService.updateById(user);
+
+ //数据同步
+ saveTrainingRegistration(trainingRegistration1,user);
+// builder.set(batchSaveTrainingRegistration(trainingRegistration1, user, builder.get()));
+ }
}
+ }else {
+ //count ++
+ count.getAndIncrement();
+ //放入集合
+ errorList.add(user.getCardid());
}
});
+// //同步
+// if (builder.get().length()>0) {
+// FtpSyncUtil.slqSync(builder.get());
+// }
+ //如果存在年龄不符的，则抛出异常
+ if (count.get()>0){
+ String errorAccount = StringUtils.join(errorList, "\\\n");
+ throw new ServiceException("保安员:[" + errorAccount + "]报名失败!年龄不符,报名年龄为[" + AgeConstant.APPLY_MIN_AGE + "-"+ AgeConstant.APPLY_MAX_AGE + "]周岁!");
+ }
return R.data(200,"报名成功");
}
@@ -366,17 +418,16 @@
return R.data(detail);
}
-// /**
-// * 导出报名数数据
-// * @param response
-// * @param trainingRegistration 培训报名对象
-// */
-// @GetMapping("export-apply")
-// @ApiOperation(value = "导出报名清册")
-// public void exportApply(HttpServletResponse response,TrainingRegistrationVo trainingRegistration) {
-// List<TrainingRegistrationExcel> list = trainingRegistrationService.getTrainingRegistrationExcelList(trainingRegistration);
-// ExcelUtil.export(response, "培训报名清册数据"+ DateUtil.time(), "培训报名清册数据表", list, TrainingRegistrationExcel.class);
-// }
+ /**
+ * 导出报名数数据
+ * @param response
+ * @param trainingRegistration 培训报名对象
+ */
+ @GetMapping("export-apply-info")
+ public void exportApplyInfo(HttpServletResponse response,TrainingRegistrationVo trainingRegistration) {
+ List<TrainingRegistrationExcel> list = trainingRegistrationService.getTrainingRegistrationExcelList(trainingRegistration);
+ ExcelUtil.export(response, "报名清册数据"+ DateUtil.time(), "报名清册数据表", list, TrainingRegistrationExcel.class);
+ }
@@ -583,7 +634,8 @@
"," + "'" + examPaper.getCreator() +"'" +
"," + "'" + creatorTimeFormat +"'" +
"," +"'" + examPaper.getAuditStatus() + "'" + ")";
- FtpUtil.sqlFileUpload(s);
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.dataSync(s);
//修改报名信息
@@ -598,11 +650,143 @@
"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 trainingRegistrationVo 考试开始时
+ */
+ @PostMapping("/batchTrainExam")
+ public R batchTrainExam(@RequestBody TrainingRegistrationVo trainingRegistrationVo){
+ //查询已报名未关联试卷的人员,同步报名列表
+ String ids = trainingRegistrationVo.getIds();
+ List<String> list = Arrays.asList(ids.split(","));
+ if (list.size()>0){
+ //生成考试
+ ExamPaper examPaper = new ExamPaper();
+ //考试类型
+ examPaper.setExamType(2);
+ //考试开始时间，考试开始截止时间
+ examPaper.setStartTime(trainingRegistrationVo.getStartTime());
+ examPaper.setEndTime(trainingRegistrationVo.getEndTime());
+ Calendar instance = Calendar.getInstance();
+ instance.setTime(trainingRegistrationVo.getStartTime());
+ 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 +"日" +"保安员证考试";
+ //考试名称
+ examPaper.setExamName(examName);
+ //考试申请人
+ examPaper.setCreator(trainingRegistrationVo.getCreator());
+ //待审核
+ examPaper.setAuditStatus(3);
+ //创建时间
+ examPaper.setCreatorDate(new Date());
+ //生成考试
+ examPaperService.save(examPaper);
+ //内网数据同步
+ Long sid = examPaper.getId();
+ String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getStartTime());
+ String endTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getEndTime());
+ String creatorTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getCreatorDate());
+ String s = "insert into ksxt_exam(id,exam_name,exam_type,start_time,end_time,creator,creator_date,audit_status) " +
+ "values(" + "'" + sid + "'" +
+ "," + "'" + examPaper.getExamName() + "'" +
+ "," + "'" + examPaper.getExamType() +"'" +
+ "," + "'" + format +"'" +
+ "," + "'" + endTimeFormat +"'" +
+ "," + "'" + examPaper.getCreator() +"'" +
+ "," + "'" + creatorTimeFormat +"'" +
+ "," +"'" + examPaper.getAuditStatus() + "'" + ")";
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.dataSync(s);
+
+ //修改报名信息
+ list.forEach(id ->{
+ //根据id查询培训信息
+ TrainingRegistration trainingRegistration = trainingRegistrationService.getById(id);
+ if (trainingRegistration.getAuditStatus()==4 && trainingRegistration.getCancel()==1) {
+ if (null == trainingRegistration.getTrainExamId() || trainingRegistration.getTrainExamId() == "") {
+ trainingRegistration.setTrainExamId(examPaper.getId().toString());
+ //提交考试审核
+ trainingRegistration.setAuditStatus(3);
+ trainingRegistrationService.updateById(trainingRegistration);
+
+ String s1 =
+ "update sys_training_registration set train_exam_id = " + "'" + trainingRegistration.getTrainExamId() + "'"
+ + ",audit_status = " + "'" + trainingRegistration.getAuditStatus() + "'"
+ + " " + "where id = " + "'" + trainingRegistration.getId() + "'";
+ //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