From 9a4a283a1413188ff5763b5e2e72c26bc2f5db3d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 08 Oct 2021 14:19:55 +0800
Subject: [PATCH] 准考证生成修改
---
src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java | 381 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 269 insertions(+), 112 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 55186da..c06adb3 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
@@ -16,17 +16,20 @@
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;
@@ -80,6 +83,8 @@
trainingRegistration.setCancel(1);
//默认为未考试状态
trainingRegistration.setIsExam(1);
+ //未提交考试审核
+ trainingRegistration.setAuditStatus(4);
trainingRegistration.setTrainingTime(new Date());
//报名
trainingRegistrationService.save(trainingRegistration);
@@ -88,16 +93,22 @@
user1.setId(Long.parseLong(trainingRegistration.getUserId()));
user1.setIsTrain(1);
userService.updateById(user1);
+
+ //内网数据同步
+ saveTrainingRegistration(trainingRegistration,user1);
+
return R.data(200,"报名成功");
}else {
if (1==user.getIsTrain()){
return R.data(201,"已报名，不能重复报名");
}
- if (2==user.getIsTrain()){
+ if (1!=user.getIsTrain()){
//已报名
trainingRegistration.setCancel(1);
//默认为未考试状态
trainingRegistration.setIsExam(1);
+ //未提交考试审核
+ trainingRegistration.setAuditStatus(4);
trainingRegistration.setTrainingTime(new Date());
//报名
trainingRegistrationService.save(trainingRegistration);
@@ -106,10 +117,32 @@
user1.setId(Long.parseLong(trainingRegistration.getUserId()));
user1.setIsTrain(1);
userService.updateById(user1);
+
+ //内网数据同步
+ saveTrainingRegistration(trainingRegistration,user1);
+
return R.data(200,"报名成功");
}
}
return R.data(202,"报名失败");
+ }
+
+ /**
+ * 报名
+ */
+ 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 s = "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(s);
}
@@ -127,26 +160,121 @@
//修改保安报名状态
user.setIsTrain(2);
userService.updateById(user);
+
+ //数据同步
+ cancelTrainingRegistrationSync(trainingRegistration,user);
+
if (status){
return R.data(200,"取消报名成功");
}
}else {
- if (user.getIsTrain()==2) {
- return R.data(201,"尚未报名");
- }
if(user.getIsTrain()==1){
trainingRegistration.setCancel(2);
boolean status = trainingRegistrationService.updateById(trainingRegistration);
//修改保安报名状态
user.setIsTrain(2);
userService.updateById(user);
+
+ //数据同步
+ cancelTrainingRegistrationSync(trainingRegistration,user);
+
if (status){
return R.data(200,"取消报名成功");
}
+
+
+
+ }else {
+ return R.data(201,"尚未报名");
}
}
return R.data(202,"取消报名失败");
+ }
+
+
+ /**
+ * 审核通过
+ * @param trainingRegistration 考试报名信息对象
+ */
+ @PostMapping("/auditSucess")
+ public R auditSucess(@RequestBody TrainingRegistration trainingRegistration){
+ //查询人员信息
+ User user = userService.getById(trainingRegistration.getUserId());
+ boolean status = false;
+ if (null!=user){
+ //修改为已报名状态
+ user.setIsTrain(1);
+ userService.updateById(user);
+
+ trainingRegistration.setAuditStatus(1);
+ trainingRegistration.setCancel(1);
+ status = trainingRegistrationService.updateById(trainingRegistration);
+
+ //数据同步
+ cancelTrainingRegistrationSync(trainingRegistration,user);
+ }
+ return R.data(status);
+ }
+
+
+ /**
+ * 取消报名,并设置为审核不通过
+ * @param trainingRegistration 考试报名信息对象
+ */
+ @PostMapping("/cancelTrainAudit")
+ public R cancelApplyAudit(@RequestBody TrainingRegistration trainingRegistration){
+ //查询人员是否已报名
+ User user = userService.getById(trainingRegistration.getUserId());
+ if(null==user.getIsTrain()){
+ trainingRegistration.setCancel(2);
+ trainingRegistration.setAuditStatus(2);
+ boolean status = trainingRegistrationService.updateById(trainingRegistration);
+ //修改保安报名状态
+ user.setIsTrain(2);
+ userService.updateById(user);
+
+ //数据同步
+ cancelTrainingRegistrationSync(trainingRegistration,user);
+
+ if (status){
+ return R.data(200,"取消报名成功");
+ }
+ }else {
+ if(user.getIsTrain()==1){
+ trainingRegistration.setCancel(2);
+ trainingRegistration.setAuditStatus(2);
+ boolean status = trainingRegistrationService.updateById(trainingRegistration);
+ //修改保安报名状态
+ user.setIsTrain(2);
+ userService.updateById(user);
+
+ //数据同步
+ cancelTrainingRegistrationSync(trainingRegistration,user);
+
+ if (status){
+ return R.data(200,"取消报名成功");
+ }
+
+ }else {
+ return R.data(201,"尚未报名");
+ }
+
+ }
+ return R.data(202,"取消报名失败");
+ }
+
+
+ /**
+ * 取消报名同步
+ */
+ private void cancelTrainingRegistrationSync(TrainingRegistration trainingRegistration,User user){
+ String s =
+ "update sys_training_registration set cancel = " + trainingRegistration.getCancel() +
+ ",audit_status = " + "'" + trainingRegistration.getAuditStatus() + "'" +
+ " " +"where id = " + "'" + trainingRegistration.getId() + "';" +
+ "update blade_user set is_train = " + user.getIsTrain() + " " +"where id = " + "'" + user.getId() + "'";
+ FtpUtil.sqlFileUpload(s);
}
/**
@@ -164,24 +292,36 @@
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()==2) {
+ 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);
}
}
});
@@ -226,27 +366,39 @@
return R.data(detail);
}
- /**
- * 导出报名数数据
- * @param response
- * @param trainingRegistration 培训报名对象
- */
- @GetMapping("export-apply")
- @ApiOperation(value = "导出报名清册")
- public void exportApply(HttpServletResponse response,TrainingRegistrationVo trainingRegistration) {
- List<ApplyInfoExcel> list = trainingRegistrationService.getTrainingRegistrationExcelList(trainingRegistration);
- ExcelUtil.export(response, "考试报名清册数据"+ DateUtil.time(), "考试报名清册数据表", list, ApplyInfoExcel.class);
- }
+// /**
+// * 导出报名数数据
+// * @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);
+// }
+
+
/**
* 导入报名考试数据
*/
@PostMapping("import-trainingRegistration")
- @ApiOperation(value = "导入报名考试数据", notes = "传入excel")
- public R importUser(MultipartFile file, Integer isCovered) {
- TrainingRegistrationImporter trainingRegistrationImporter = new TrainingRegistrationImporter(trainingRegistrationService, false);
- ExcelUtil.save(file, trainingRegistrationImporter, ApplyInfoExcel.class);
+ @ApiOperation(value = "导入培训报名数据", notes = "传入excel")
+ public R importUser(MultipartFile file, Integer isCovered,Long examId) {
+ TrainingRegistrationImporter trainingRegistrationImporter = new TrainingRegistrationImporter(trainingRegistrationService, false,examId);
+ ExcelUtil.save(file, trainingRegistrationImporter, TrainingRegistrationExcel.class);
return R.success("操作成功");
+ }
+
+ /**
+ * 导出模板
+ */
+ @GetMapping("export-template")
+ @ApiOperation(value = "导出模板")
+ public void exportUser(HttpServletResponse response) {
+ List<TrainingRegistrationExcel> list = new ArrayList<>();
+ ExcelUtil.export(response, "培训报名数据模板", "培训报名数据表", list, TrainingRegistrationExcel.class);
}
@@ -254,57 +406,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;
+// }
/**
@@ -386,64 +538,69 @@
/**
- * 生成试卷,报名
- * @param ids 报名ids
+ * 生成试卷,报名，考试申请
+ * @param trainingRegistrationVo 考试开始时
*/
@PostMapping("/batchExam")
- public R batchExam(@RequestParam String ids,
- @RequestParam String examTime,
- @RequestParam Date startTime,
- @RequestParam Date endTime){
- if (!ids.equals("")){
- List<String> list = Arrays.asList(ids.split(","));
- if (list.size()>0){
- ExamPaper examPaper = new ExamPaper();
- examPaper.setExamTime(examTime);
- examPaper.setExamType(2);
- examPaper.setStartTime(startTime);
- examPaper.setEndTime(endTime);
- Calendar instance = Calendar.getInstance();
- instance.setTime(startTime);
- 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.setAuditStatus(3);
- //生成考试
- examPaperService.save(examPaper);
- }
-
+ public R batchExam(@RequestBody TrainingRegistrationVo trainingRegistrationVo){
+ if (trainingRegistrationVo.getNumber()==0){
+ return R.data("报名人数不能小于1人");
}else {
- //查询已报名未关联试卷的人员
- List<Long> applyIds = trainingRegistrationService.getTrainIds();
+ //查询已报名的人员前 number 个
+ //查询已报名未关联试卷的人员,同步报名列表
+ List<TrainingRegistration> applyIds = trainingRegistrationService.getTrainIds(trainingRegistrationVo);
if (applyIds.size()>0){
//生成考试
ExamPaper examPaper = new ExamPaper();
- examPaper.setExamTime(examTime);
examPaper.setExamType(2);
- examPaper.setStartTime(startTime);
- examPaper.setEndTime(endTime);
+ examPaper.setStartTime(trainingRegistrationVo.getStartTime());
+ examPaper.setEndTime(trainingRegistrationVo.getEndTime());
Calendar instance = Calendar.getInstance();
- instance.setTime(startTime);
+ 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 +"日" +"保安员证模拟考试";
+ 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);
+
+
//修改报名信息
-// applyIds.forEach(id ->{
-// Apply apply = new Apply();
-// apply.setId(id);
-// apply.setExamId(examPaper.getId());
-// apply.setCandidateNo(getCandidateNo(apply));
-// applyService.updateById(apply);
-// });
+ applyIds.forEach(trainingRegistration ->{
+ 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