From 0d99d26f39e055ee17fdbf2c5cbd1daf695c4310 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 13 Sep 2021 21:28:42 +0800
Subject: [PATCH] 报名新增，报名查询，报名清册，培训报名，培训报名查询修改
---
src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java | 399 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 353 insertions(+), 46 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 db13a74..586817b 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
@@ -16,14 +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;
@@ -34,9 +40,7 @@
import javax.servlet.http.HttpServletResponse;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
/**
* @author zhongrj
@@ -50,7 +54,7 @@
private final TrainingRegistrationService trainingRegistrationService;
- private final TrainExamService trainExamService;
+ private final IUserService userService;
private final ExamPaperService examPaperService;
@@ -71,8 +75,257 @@
*/
@PostMapping("/save")
@ApiOperation(value = "新增", notes = "传入trainingRegistration")
- public R save(@RequestBody TrainingRegistration trainingRegistration) throws Exception {
- return R.status(trainingRegistrationService.save(trainingRegistration));
+ public R save(@RequestBody TrainingRegistration trainingRegistration){
+ //查询人员是否已报名
+ User user = userService.getById(trainingRegistration.getUserId());
+ if (null==user.getIsTrain()){
+ //已报名
+ trainingRegistration.setCancel(1);
+ //默认为未考试状态
+ trainingRegistration.setIsExam(1);
+ //未提交考试审核
+ trainingRegistration.setAuditStatus(4);
+ trainingRegistration.setTrainingTime(new Date());
+ //报名
+ trainingRegistrationService.save(trainingRegistration);
+ //修改保安报名状态
+ User user1 = new User();
+ 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 (1!=user.getIsTrain()){
+ //已报名
+ trainingRegistration.setCancel(1);
+ //默认为未考试状态
+ trainingRegistration.setIsExam(1);
+ //未提交考试审核
+ trainingRegistration.setAuditStatus(4);
+ trainingRegistration.setTrainingTime(new Date());
+ //报名
+ trainingRegistrationService.save(trainingRegistration);
+ //修改保安报名状态
+ User user1 = new User();
+ 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);
+ }
+
+
+ /**
+ * 取消报名
+ * @param trainingRegistration 考试报名信息对象
+ */
+ @PostMapping("/cancelTrain")
+ public R cancelApply(@RequestBody TrainingRegistration trainingRegistration){
+ //查询人员是否已报名
+ User user = userService.getById(trainingRegistration.getUserId());
+ if(null==user.getIsTrain()){
+ trainingRegistration.setCancel(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);
+ 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);
+ }
+
+ /**
+ * 批量报名
+ * @param trainingRegistration 考试报名信息对象
+ */
+ @PostMapping("/batchTrain")
+ public R batchApply(@RequestBody TrainingRegistrationVo trainingRegistration){
+ List<String> list = Arrays.asList(trainingRegistration.getUserIds().split(","));
+ 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) {
+ 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);
+ }
+ }
+ });
+ return R.data(200,"报名成功");
}
/**
@@ -80,8 +333,7 @@
* @param trainingRegistration 报名培训信息对象
*/
@PostMapping("/update")
- public R update(@RequestBody TrainingRegistration trainingRegistration) throws Exception {
- arg.test01(arg.url+"/trainingRegistration/update",trainingRegistration);
+ public R update(@RequestBody TrainingRegistration trainingRegistration){
return R.status(trainingRegistrationService.updateById(trainingRegistration));
}
@@ -90,28 +342,8 @@
* @param trainingRegistration 报名培训信息对象
*/
@PostMapping("/submit")
- public R submit(@RequestBody TrainingRegistration trainingRegistration) throws Exception {
- if (null==trainingRegistration.getId()){
- //查询是否已报名
- Integer registration = trainingRegistrationService.getTrainingRegistrationInfo(trainingRegistration);
- if (null!=registration){
- return R.data(201,"已报名，不能重复报名");
- }
- trainingRegistration.setTrainingTime(new Date());
- trainingRegistration.setCancel(1);
- //默认报名未考试状态
- trainingRegistration.setIsExam(1);
- //去生成准考证号码
- trainingRegistration.setCandidateNo(getCandidateNo(trainingRegistration));
- //去生成考试编号
-// trainingRegistration.setApplyCode(getApplyCode(trainingRegistration));
- }
-// arg.test01(arg.url+"/trainingRegistration/submit",trainingRegistration);
- boolean status = trainingRegistrationService.saveOrUpdate(trainingRegistration);
- if (status){
- return R.data(200,"报名成功");
- }
- return R.data(202,"报名失败");
+ public R submit(@RequestBody TrainingRegistration trainingRegistration){
+ return R.data(trainingRegistrationService.saveOrUpdate(trainingRegistration));
}
/**
@@ -120,7 +352,6 @@
*/
@PostMapping("/remove")
public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
- arg.sendPostRemoveByIds(arg.url+"/trainingRegistration/remove",ids);
return R.status(trainingRegistrationService.removeByIds(Func.toLongList(ids)));
}
@@ -135,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);
}
@@ -292,4 +535,68 @@
}
return pinyinStr;
}
+
+
+ /**
+ * 生成试卷,报名
+ * @param trainingRegistrationVo 考试开始时
+ */
+ @PostMapping("/batchExam")
+ public R batchExam(@RequestBody TrainingRegistrationVo trainingRegistrationVo){
+ if (trainingRegistrationVo.getNumber()==0){
+ return R.data("报名人数不能小于1人");
+ }else {
+ //查询已报名的人员前 number 个
+ //查询已报名未关联试卷的人员,同步报名列表
+ List<TrainingRegistration> applyIds = trainingRegistrationService.getTrainIds(trainingRegistrationVo);
+ if (applyIds.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.setAuditStatus(3);
+ //生成考试
+ 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) " +
+ "values(" + "'" + sid + "'" +
+ "," + "'" + examPaper.getExamName() + "'" +
+ "," + "'" + examPaper.getExamType() +"'" +
+ "," + "'" + format +"'" +
+ "," + "'" + endTimeFormat +"'" +
+ "," +"'" + examPaper.getAuditStatus() + "'" + ")";
+ FtpUtil.sqlFileUpload(s);
+
+
+ //修改报名信息
+ 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