From dca2532f01dac86be25ad09fa9ee8035bccdca6a Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 27 Nov 2021 17:11:33 +0800
Subject: [PATCH] 1.部门tree修改 2.用户查询修改 3.培训报名年龄拦截
---
src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java | 263 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 177 insertions(+), 86 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 586817b..f7e911a 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
@@ -9,38 +9,32 @@
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.AgeUtil;
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;
-import org.springblade.core.tool.utils.DateUtil;
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.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.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;
/**
* @author zhongrj
@@ -284,34 +278,23 @@
@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<>();
+ //遍历
list.forEach(userId ->{
User user = userService.getById(userId);
- //未报名的新增，已报名的不做处理
- if (null==user.getIsTrain()) {
- TrainingRegistration trainingRegistration1 = new TrainingRegistration();
- trainingRegistration1.setCancel(1);
- //默认为未考试状态
- trainingRegistration1.setIsExam(1);
- //未提交考试审核
- trainingRegistration.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) {
+ //判断年龄
+ Integer age = AgeUtil.idCardToAge(user.getCardid());
+ if (age>=18 && age<=60) {
+ //未报名的新增，已报名的不做处理
+ if (null == user.getIsTrain()) {
TrainingRegistration trainingRegistration1 = new TrainingRegistration();
trainingRegistration1.setCancel(1);
//默认为未考试状态
trainingRegistration1.setIsExam(1);
//未提交考试审核
- trainingRegistration.setAuditStatus(4);
+ trainingRegistration1.setAuditStatus(4);
trainingRegistration1.setTrainingTime(new Date());
trainingRegistration1.setUserId(userId);
trainingRegistration1.setTrainingUnitId(trainingRegistration.getTrainingUnitId());
@@ -321,10 +304,39 @@
userService.updateById(user);
//数据同步
- saveTrainingRegistration(trainingRegistration1,user);
+ saveTrainingRegistration(trainingRegistration1, user);
+ } 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);
+ }
}
+ }else {
+ //count ++
+ count.getAndIncrement();
+ //放入集合
+ errorList.add(user.getCardid());
}
});
+ //如果存在年龄不符的，则抛出异常
+ if (count.get()>0){
+ String errorAccount = StringUtils.join(errorList, "\\\n");
+ throw new ServiceException("保安员:[" + errorAccount + "]报名失败!年龄不符,报名年龄为[18-60]周岁!");
+ }
return R.data(200,"报名成功");
}
@@ -406,57 +418,57 @@
* 生成准考证号码
* @param trainingRegistration 考试报名信息对象
*/
- private String getCandidateNo(TrainingRegistration trainingRegistration) {
- //获取考试信息
- ExamPaper examPaper = examPaperService.getById(trainingRegistration.getTrainExamId());
- if (null!=examPaper.getStartTime()){
- String format = new SimpleDateFormat("yyyy-MM-dd").format(examPaper.getStartTime());
- String year = format.substring(2,4);
- String quarter = null;
- String months = null;
- String days = null;
- int month = Integer.parseInt(format.substring(5,7));
- int day = Integer.parseInt(format.substring(8,10));
- if (month>0 && month<=3){
- quarter = "C";
- }
- if (month>3 && month<=6){
- quarter = "X";
- }
- if (month>6 && month<=9){
- quarter = "Q";
- }
- if (month>9 && month<=12){
- quarter = "D";
- }
- if (month<=9){
- months = "0" + month;
- }
- if (day<=9){
- days = "0" + day;
- }
- //获取考试名称前缀,去除数字，字母
- String examName
- = examPaper.getExamName().replaceAll("\\s*", "").replaceAll("[^(\\u4e00-\\u9fa5)]", "").substring(0,1);
-
- //前缀 = 年的最后两位 + 月份（两位） + 考试名称（中文拼音）首字母（去除数字，字母） + 考试类型 + 季度拼音首字母大写（春季就是 C）
- String result = year
- + months
- + toFirstChar(examName).toUpperCase()
- + examPaper.getExamType()
- + quarter;
- //查询是当前前缀已生成的数量
- int count = trainingRegistrationService.getCandidateNoCount(result);
- if (count==0){
- return result + "0000";
- }
- //格式化
- DecimalFormat decimalFormat = new DecimalFormat("0000");
- //返回
- return result + (decimalFormat.format(count++));
- }
- return null;
- }
+// private String getCandidateNo(TrainingRegistration trainingRegistration) {
+// //获取考试信息
+// ExamPaper examPaper = examPaperService.getById(trainingRegistration.getTrainExamId());
+// if (null!=examPaper.getStartTime()){
+// String format = new SimpleDateFormat("yyyy-MM-dd").format(examPaper.getStartTime());
+// String year = format.substring(2,4);
+// String quarter = null;
+// String months = null;
+// String days = null;
+// int month = Integer.parseInt(format.substring(5,7));
+// int day = Integer.parseInt(format.substring(8,10));
+// if (month>0 && month<=3){
+// quarter = "C";
+// }
+// if (month>3 && month<=6){
+// quarter = "X";
+// }
+// if (month>6 && month<=9){
+// quarter = "Q";
+// }
+// if (month>9 && month<=12){
+// quarter = "D";
+// }
+// if (month<=9){
+// months = "0" + month;
+// }
+// if (day<=9){
+// days = "0" + day;
+// }
+// //获取考试名称前缀,去除数字，字母
+// String examName
+// = examPaper.getExamName().replaceAll("\\s*", "").replaceAll("[^(\\u4e00-\\u9fa5)]", "").substring(0,1);
+//
+// //前缀 = 年的最后两位 + 月份（两位） + 考试名称（中文拼音）首字母（去除数字，字母） + 考试类型 + 季度拼音首字母大写（春季就是 C）
+// String result = year
+// + months
+// + toFirstChar(examName).toUpperCase()
+// + examPaper.getExamType()
+// + quarter;
+// //查询是当前前缀已生成的数量
+// int count = trainingRegistrationService.getCandidateNoCount(result);
+// if (count==0){
+// return result + "0000";
+// }
+// //格式化
+// DecimalFormat decimalFormat = new DecimalFormat("0000");
+// //返回
+// return result + (decimalFormat.format(count++));
+// }
+// return null;
+// }
/**
@@ -538,7 +550,7 @@
/**
- * 生成试卷,报名
+ * 生成试卷,报名，考试申请
* @param trainingRegistrationVo 考试开始时
*/
@PostMapping("/batchExam")
@@ -562,27 +574,33 @@
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 s = "insert into ksxt_exam(id,exam_name,exam_type,start_time,end_time,audit_status) " +
+ 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);
//修改报名信息
applyIds.forEach(trainingRegistration ->{
- if(null==trainingRegistration.getTrainExamId() && trainingRegistration.getTrainExamId()=="") {
+ if(null==trainingRegistration.getTrainExamId() || trainingRegistration.getTrainExamId()=="") {
trainingRegistration.setTrainExamId(examPaper.getId().toString());
//提交考试审核
trainingRegistration.setAuditStatus(3);
@@ -599,4 +617,77 @@
}
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);
+
+ //修改报名信息
+ 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);
+ }
+ }
+ });
+ }
+ return null;
+ }
}
--
Gitblit v1.9.3