From d8103e5da17cd3dc9fb16abc223b6adcf93f0383 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 12 Aug 2021 14:26:30 +0800
Subject: [PATCH] 培训列表接口修改，帅选出已报名培训的数据
---
src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java | 141 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 122 insertions(+), 19 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..2470d65 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
@@ -19,9 +19,12 @@
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.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.TrainingRegistrationImporter;
@@ -34,6 +37,7 @@
import javax.servlet.http.HttpServletResponse;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.UUID;
@@ -50,7 +54,7 @@
private final TrainingRegistrationService trainingRegistrationService;
- private final TrainExamService trainExamService;
+ private final IUserService userService;
private final ExamPaperService examPaperService;
@@ -71,8 +75,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 +196,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 +205,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 +215,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)));
}
--
Gitblit v1.9.3