From ddebcfaf85cbb400668f38b1efd82e439c6e1012 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 13 Aug 2021 08:39:43 +0800
Subject: [PATCH] 报名考试接口修改
---
src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java | 255 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 220 insertions(+), 35 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 39cfd29..d04e472 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
@@ -19,11 +19,16 @@
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 +39,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 +53,7 @@
private final TrainingRegistrationService trainingRegistrationService;
- private final TrainExamService trainExamService;
+ private final IUserService userService;
private final ExamPaperService examPaperService;
@@ -71,8 +74,120 @@
*/
@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.setTrainingTime(new Date());
+ //报名
+ trainingRegistrationService.save(trainingRegistration);
+ //修改保安报名状态
+ User user1 = new User();
+ user1.setId(Long.parseLong(trainingRegistration.getUserId()));
+ user1.setIsTrain(1);
+ userService.updateById(user1);
+ return R.data(200,"报名成功");
+ }else {
+ if (1==user.getIsTrain()){
+ return R.data(201,"已报名，不能重复报名");
+ }
+ if (2==user.getIsTrain()){
+ //已报名
+ trainingRegistration.setCancel(1);
+ //默认为未考试状态
+ trainingRegistration.setIsExam(1);
+ trainingRegistration.setTrainingTime(new Date());
+ //报名
+ trainingRegistrationService.save(trainingRegistration);
+ //修改保安报名状态
+ User user1 = new User();
+ user1.setId(Long.parseLong(trainingRegistration.getUserId()));
+ user1.setIsTrain(1);
+ userService.updateById(user1);
+ return R.data(200,"报名成功");
+ }
+ }
+ return R.data(202,"报名失败");
+ }
+
+
+ /**
+ * 取消报名
+ * @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);
+ 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);
+ if (status){
+ return R.data(200,"取消报名成功");
+ }
+ }
+
+ }
+ return R.data(202,"取消报名失败");
+ }
+
+ /**
+ * 批量报名
+ * @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);
+ trainingRegistration1.setTrainingTime(new Date());
+ trainingRegistration1.setUserId(userId);
+ trainingRegistrationService.save(trainingRegistration1);
+ //修改保安报名状态
+ user.setIsTrain(1);
+ userService.updateById(user);
+ }else {
+ if (user.getIsTrain()==2) {
+ TrainingRegistration trainingRegistration1 = new TrainingRegistration();
+ trainingRegistration1.setCancel(1);
+ //默认为未考试状态
+ trainingRegistration1.setIsExam(1);
+ trainingRegistration1.setTrainingTime(new Date());
+ trainingRegistration1.setUserId(userId);
+ trainingRegistrationService.save(trainingRegistration1);
+ //修改保安报名状态
+ user.setIsTrain(1);
+ userService.updateById(user);
+ }
+ }
+ });
+ return R.data(200,"报名成功");
}
/**
@@ -80,8 +195,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,19 +204,8 @@
* @param trainingRegistration 报名培训信息对象
*/
@PostMapping("/submit")
- public R submit(@RequestBody TrainingRegistration trainingRegistration) throws Exception {
- if (null==trainingRegistration.getId()){
- 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);
- return R.status(trainingRegistrationService.saveOrUpdate(trainingRegistration));
+ public R submit(@RequestBody TrainingRegistration trainingRegistration){
+ return R.data(trainingRegistrationService.saveOrUpdate(trainingRegistration));
}
/**
@@ -111,7 +214,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)));
}
@@ -126,27 +228,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")
+ @ApiOperation(value = "导入培训报名数据", notes = "传入excel")
public R importUser(MultipartFile file, Integer isCovered) {
TrainingRegistrationImporter trainingRegistrationImporter = new TrainingRegistrationImporter(trainingRegistrationService, false);
- ExcelUtil.save(file, trainingRegistrationImporter, ApplyInfoExcel.class);
+ 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);
}
@@ -283,4 +397,75 @@
}
return pinyinStr;
}
+
+
+ /**
+ * 生成试卷,报名
+ * @param ids 报名ids
+ */
+ @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);
+ //修改报名信息
+ list.forEach(id ->{
+ TrainingRegistration trainingRegistration = new TrainingRegistration();
+ trainingRegistration.setId(Long.parseLong(id));
+ trainingRegistration.setTrainExamId(examPaper.getId().toString());
+ trainingRegistrationService.updateById(trainingRegistration);
+ });
+ }
+
+ }else {
+ //查询已报名未关联试卷的人员
+ List<Long> applyIds = trainingRegistrationService.getTrainIds();
+ if (applyIds.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);
+ //修改报名信息
+ applyIds.forEach(id ->{
+ TrainingRegistration trainingRegistration = new TrainingRegistration();
+ trainingRegistration.setId(id);
+ trainingRegistration.setTrainExamId(examPaper.getId().toString());
+ trainingRegistrationService.updateById(trainingRegistration);
+ });
+ }
+ }
+ return null;
+ }
}
--
Gitblit v1.9.3