fix(培训模块): 修改继续培训 重新报名无效果

dev-misc/src/main/java/com/tykj/dev/misc/base/StatusEnum.java

@@ -149,6 +149,10 @@ public enum StatusEnum {
 
     TRAIN1015(1015, "待批阅试卷"),
 
+    TRAIN1016(1016, "待继续报名"),
+
+    TRAIN1017(1017, "待重新报名"),
+
     WORKHANDOVER1011(1011, "待上传签字单"),
 
 

dev-train/src/main/java/com/tykj/dev/device/train/controller/TrainJobController.java

@@ -202,7 +202,11 @@ public class TrainJobController {
     public ResponseEntity signUp(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser, @RequestBody signUpReturn signUpReturn) {
         TrainTheme trainTheme = trainThemeService.findById(signUpReturn.getTrainThemeId());
         TaskBto taskBto = taskService.get(signUpReturn.getTaskId());
-        TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.TRAIN1002);
+        List<StatusEnum> statusEnums =new ArrayList<>();
+        statusEnums.add(StatusEnum.TRAIN1002);
+        statusEnums.add(StatusEnum.TRAIN1016);
+        statusEnums.add(StatusEnum.TRAIN1017);
+        TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),statusEnums);
         Integer taskId=taskBto.getId();
         List<Integer> userIds=new ArrayList<>();
         TrainUnit trainUnit= trainUnitDao.findByTrainIdAndUnitId(trainTheme.getTrainId(),taskBto.getOwnUnit());
@@ -235,6 +239,7 @@ public class TrainJobController {
 //        userLogService.save(new UserLog(securityUser.getCurrentUserInfo().getUserId(),new Date(),"不参加培训"));
 //        taskBto.setCreateUserId(securityUser.getCurrentUserInfo().getUserId());
 //        taskBto = taskService.moveToEnd(taskBto);
+        taskBto =taskService.moveToSpecial(taskBto,StatusEnum.TRAIN1016,0);
         trainUnitDao.save(trainUnit);
         messageService.add(new MessageBto(0, BusinessEnum.TRAIN_SIGN_UP.id, "帮你 报名"+(trainTheme.getTrainType()==0 ? "线上" : "线下")+"培训:["+messageToString(trainTheme)+"]", userIds, trainTheme.getTrainId().toString()));
         return ResponseEntity.ok(taskBto);
@@ -257,8 +262,8 @@ public class TrainJobController {
         TaskBto taskBto = taskService.get(taskId);
         Units units=unitsService.findById(taskBto.getOwnUnit());
         TrainTheme trainTheme = trainThemeService.findById(taskBto.getBillId());
-        TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(), StatusEnum.END);
-        taskBto = taskService.moveToSpecial(taskBto, StatusEnum.TRAIN1002, 0);
+        TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(), StatusEnum.TRAIN1016);
+        taskBto = taskService.moveToSpecial(taskBto, StatusEnum.TRAIN1017, 0);
         List<Integer> userIds = userService.findAllByUnite(securityUser.getCurrentUserInfo().getUnitsId()).stream().map(User::getUserId).collect(Collectors.toList());
         userIds.addAll(userService.findAllByUnite(trainTheme.getUnitsId()).stream().filter(user -> !user.getUserId().equals(securityUser.getCurrentUserInfo().getUserId())).map(User::getUserId).collect(Collectors.toList()));
         messageService.add(new MessageBto(0, BusinessEnum.TRAIN.id, "让 重新培训报名:【"+units.getName()+"】", userIds, trainTheme.getTrainId().toString()));
@@ -282,6 +287,16 @@ public class TrainJobController {
                     taskService.moveToEnd(taskBto);
                 }
         );
+        trainTaskService.selectBillidAndBillType(trainId, BusinessEnum.TRAIN_SIGN_UP.id, StatusEnum.TRAIN1016.id).forEach(
+                taskBto -> {
+                    taskService.moveToEnd(taskBto);
+                }
+        );
+        trainTaskService.selectBillidAndBillType(trainId, BusinessEnum.TRAIN_SIGN_UP.id, StatusEnum.TRAIN1017.id).forEach(
+                taskBto -> {
+                    taskService.moveToEnd(taskBto);
+                }
+        );
         //查询主task
         TaskBto taskBto = trainTaskService.selectFatherIsNullAndBillidAndBillType(trainTheme.getTrainId(), BusinessEnum.TRAIN.id);
        //主task往下推待培训状态，0

dev-train/src/main/java/com/tykj/dev/device/train/service/impl/TrainThemeServiceImpl.java

@@ -193,7 +193,7 @@ public class TrainThemeServiceImpl implements TrainThemeService {
                     taskBto1 -> {
                         TrainUnit trainUnit=trainUnitMap.get(taskBto1.getOwnUnit());
                         List<TrainUser> trainUsersNotSignUp = trainUsers.stream().filter(trainUser -> trainUser.getUnitsId().equals(taskBto1.getOwnUnit()) && trainUser.getIsSignUp() == 2).collect(Collectors.toList());
-                        if (taskBto1.getBillStatus().equals(StatusEnum.TRAIN1002.id) && trainUnit.getSubmitStatus()==1){
+                        if (taskBto1.getBillStatus().equals(StatusEnum.TRAIN1017.id)){
                            flag.set(false);
                            List<TrainUser> trainUserList = trainUsers.stream().filter(trainUser -> trainUser.getUnitsId().equals(taskBto1.getOwnUnit())).collect(Collectors.toList());
                            notSignUpTrainUserToUnitVo.add(new TrainUserToUnitVo(taskBto1.getOwnUnit(), unitsCache.findById(taskBto1.getOwnUnit()).getName(), trainUserList, taskBto1.getId(),trainUnit.getSubmitStatus()));
@@ -204,6 +204,9 @@ public class TrainThemeServiceImpl implements TrainThemeService {
                            }
                            notSignUpTrainUserToUnitVo.add(new TrainUserToUnitVo(taskBto1.getOwnUnit(), unitsCache.findById(taskBto1.getOwnUnit()).getName(), trainUsersNotSignUp, taskBto1.getId(),trainUnit.getSubmitStatus()));
                        }
+                        if (trainUnit.getSubmitStatus()==1){
+                            flag.set(false);
+                        }
                     }
             );
             trainRegistrationVo.setGenerateTestPaper(JacksonUtil.readValue(trainTheme.getGenerateTestPaperString(),GenerateTestPaper.class));

dev-train/src/main/java/com/tykj/dev/device/train/task/TrainTask.java

@@ -76,6 +76,16 @@ public class TrainTask {
                     taskService.moveToEnd(taskBto);
                 }
         );
+        trainTaskService.selectBillidAndBillType(trainId, BusinessEnum.TRAIN_SIGN_UP.id, StatusEnum.TRAIN1016.id).forEach(
+                taskBto -> {
+                    taskService.moveToEnd(taskBto);
+                }
+        );
+        trainTaskService.selectBillidAndBillType(trainId, BusinessEnum.TRAIN_SIGN_UP.id, StatusEnum.TRAIN1017.id).forEach(
+                taskBto -> {
+                    taskService.moveToEnd(taskBto);
+                }
+        );
         //查询主task
         TaskBto taskBto = trainTaskService.selectFatherIsNullAndBillidAndBillType(trainTheme.getTrainId(), BusinessEnum.TRAIN.id);
         //主task往下推待培训状态，0