[培训] 代码提交

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

@@ -111,7 +111,16 @@ public enum BusinessEnum {
     /**
      * 重新入库
      */
-    AGAINSTORAGE(26,"装备状态转换业务");
+    AGAINSTORAGE(26,"装备状态转换业务"),
+
+    //培训报名
+    TRAIN_SIGN_UP(27,"培训报名"),
+
+    //培训学习
+    TRAIN_STUDY(28,"培训学习"),
+
+
+    ;
 
     public Integer id;
 

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

@@ -192,7 +192,7 @@ public class TrainJobController {
                 unitId->{
                     List<Integer> list = new ArrayList<>();
                     list.add(0);
-                    TaskBto taskBto= new TaskBto(StatusEnum.TRAIN1002.id, trainTheme.getName(), task.getId(), task.getId().toString(), trainTheme.getTrainId(), BusinessEnum.TRAIN.id, unitId, 0, null, list);
+                    TaskBto taskBto= new TaskBto(StatusEnum.TRAIN1002.id, trainTheme.getName(), task.getId(), task.getId().toString(), trainTheme.getTrainId(), BusinessEnum.TRAIN_SIGN_UP.id, unitId, 0, null, list);
                     taskBto=taskService.start(taskBto);
 //                    taskBto.setCreateUserId(null);
 //                    taskService.update(taskBto);
@@ -296,7 +296,7 @@ public class TrainJobController {
     public ResponseEntity signUpEnd(@PathVariable Integer trainId) {
         TrainTheme trainTheme = trainThemeService.findById(trainId);
         //查询所有必须报名而没有报名的task 状态直接转为待培训
-        trainTaskService.selectBillidAndBillType(trainId, BusinessEnum.TRAIN.id, StatusEnum.TRAIN1002.id).forEach(
+        trainTaskService.selectBillidAndBillType(trainId, BusinessEnum.TRAIN_SIGN_UP.id, StatusEnum.TRAIN1002.id).forEach(
                 taskBto -> {
                     taskService.moveToEnd(taskBto);
                 }
@@ -323,10 +323,13 @@ public class TrainJobController {
 
         //判断是否为线上培训 如是 则任务发给个人 如不是 则给单位推送任务。
         if (trainTheme.getTrainType()==1) {
-            trainTaskService.selectBillidAndBillType(trainId, BusinessEnum.TRAIN.id, StatusEnum.TRAIN1010.id).forEach(
-                    taskBto1 -> taskService.moveToSpecial(taskBto1, StatusEnum.TRAIN1004, taskBto1.getInvolveUserIdList().get(0))
-            );
+//            trainTaskService.selectBillidAndBillType(trainId, BusinessEnum.TRAIN_SIGN_UP.id, StatusEnum.TRAIN1010.id).forEach(
+//                    taskBto1 -> taskService.moveToSpecial(taskBto1, StatusEnum.TRAIN1004, taskBto1.getInvolveUserIdList().get(0))
+//            );
         }else {
+//            trainTaskService.selectBillidAndBillType(trainId, BusinessEnum.TRAIN_SIGN_UP.id, StatusEnum.TRAIN1003.id).forEach(
+//                    taskBto1 -> taskService.moveToEnd(taskBto1)
+//            );
            List<Integer> userIds= trainUserDao.findAllByIsSignUpAndTrainId(1,trainId).stream().map(TrainUser::getUserId).collect(Collectors.toList());
            userIds.forEach(
                    userId-> onlineLearningTask(trainId,taskBto.getId(),trainTheme.getName(),userId,taskBto.getOwnUnit())
@@ -693,6 +696,6 @@ public class TrainJobController {
     private TaskBto onlineLearningTask(Integer trainId, Integer parentTaskId,String title,Integer userId,Integer ownUnitId){
         List<Integer> list=new ArrayList<>();
         list.add(userId);
-        return taskService.start(new TaskBto(StatusEnum.TRAIN1012.id,title , parentTaskId, ".", trainId, BusinessEnum.TRAIN.id, ownUnitId, 0, "online", list));
+        return taskService.start(new TaskBto(StatusEnum.TRAIN1012.id,title , parentTaskId, ".", trainId, BusinessEnum.TRAIN_STUDY.id, ownUnitId, 0, "online", list));
     }
 }