[培训] bug提交

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

@@ -352,7 +352,7 @@ public class TrainJobController {
         List<TrainUser> userList= trainUserDao.findAllByTrainId(trainId).stream().filter(trainUser -> trainUser.getIsSignUp()==1).collect(Collectors.toList());
         if (userList.stream().allMatch(trainUser -> trainUser.getOnlineStatus()==2 ||trainUser.getOnlineStatus()==3)) {
             waitExaminesVo.setIsNot(1);
-            taskService.moveToSpecial(taskBto, StatusEnum.TRAIN1015);
+            taskService.moveToSpecial(taskBto, StatusEnum.TRAIN1015,0);
             trainTheme.setIsNotExamines(1);
         }
         waitExaminesVo.setTrainUsers(userList);
@@ -423,7 +423,7 @@ public class TrainJobController {
         trainUser.setOnlineStatus(2);
         trainUserDao.save(trainUser);
         TaskBto taskBto = taskService.get(testPaper.getTaskId());
-        taskService.moveToSpecial(taskBto,StatusEnum.TRAIN1013);
+        taskService.moveToSpecial(taskBto,StatusEnum.TRAIN1013,-1);
         testPaper = testPaperDao.save(testPaper);
         return ResponseEntity.ok(testPaper);
     }
@@ -451,12 +451,12 @@ public class TrainJobController {
         trainUser.setOnlineStatus(3);
         trainUserDao.save(trainUser);
         TaskBto testPaperTaskBto = taskService.get(testPaper.getTaskId());
-        taskService.moveToEnd(testPaperTaskBto);
+        taskService.moveToSpecial(testPaperTaskBto,StatusEnum.TRAIN1013,-1);
         testPaper = testPaperDao.save(testPaper);
         List<TestPaper> testPapers= testPaperService.findByTrainIdAndStatus(testPaper.getTrainId(),0);
         if (testPapers==null||testPapers.size()==0){
            TaskBto taskBto = trainTaskService.selectFatherIsNullAndBillidAndBillType(testPaper.getTrainId(), BusinessEnum.TRAIN.id);
-           taskService.moveToSpecial(taskBto,StatusEnum.TRAIN1007);
+           taskService.moveToSpecial(taskBto,StatusEnum.TRAIN1007,0);
            TrainTheme trainTheme= trainThemeService.findById(testPaper.getTrainId());
            trainTheme.setIsNotExamines(2);
            trainThemeService.save(trainTheme);