feat(培训模块): 添加线上培训实时批阅的功能

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

@@ -341,21 +341,21 @@ public class TrainJobController {
     public ResponseEntity inTraining(@PathVariable Integer trainId, @PathVariable Integer taskId) {
         TrainTheme trainTheme = trainThemeService.findById(trainId);
         //5 培训中
-        TaskBto taskBto = taskService.get(taskId);
         WaitExaminesVo waitExaminesVo=trainTheme.toWaitExaminesVo();
         waitExaminesVo.setTrainDataFileList(FilesUtil.stringFileToList(trainTheme.getTrainDataFiles()));
         waitExaminesVo.setCoursewareFileList(JacksonUtil.readValue(trainTheme.getCoursewareFiles(), new TypeReference<List<CoursewareFile>>() {
         }));
         waitExaminesVo.setGenerateTestPaper(JacksonUtil.readValue(trainTheme.getGenerateTestPaperString(), GenerateTestPaper.class));
         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,0);
-            trainTheme.setIsNotExamines(1);
-        }
+//        if (userList.stream().allMatch(trainUser -> trainUser.getOnlineStatus()==2 ||trainUser.getOnlineStatus()==3)) {
+//            if (!taskBto.getBillStatus().equals(StatusEnum.TRAIN1007.id)) {
+//                taskService.moveToSpecial(taskBto, StatusEnum.TRAIN1015, 0);
+//                trainTheme.setTrainStatus(StatusEnum.TRAIN1015.id);
+//            }
+//            waitExaminesVo.setIsNot(1);
+//            trainTheme.setIsNotExamines(1);
+//        }
         waitExaminesVo.setTrainUsers(userList);
-        trainTheme.setTrainStatus(StatusEnum.TRAIN1015.id);
-        trainThemeService.save(trainTheme);
         return ResponseEntity.ok(waitExaminesVo);
     }
 
@@ -450,13 +450,14 @@ public class TrainJobController {
         trainUserDao.save(trainUser);
         TaskBto testPaperTaskBto = taskService.get(testPaper.getTaskId());
         taskService.moveToSpecial(testPaperTaskBto,StatusEnum.TRAIN1013,-1);
-        testPaper = testPaperDao.save(testPaper);
-        List<TestPaper> testPapers= testPaperService.findByTrainIdAndStatus(testPaper.getTrainId(),0);
-        if (testPapers==null||testPapers.size()==0){
+        testPaperDao.save(testPaper);
+        boolean falg=trainUserDao.findAllByTrainId(readOverTestPaper.getTrainId()).stream().filter(trainUser1 -> trainUser1.getIsSignUp()==1).allMatch(trainUser1 -> trainUser1.getOnlineStatus()==3);
+        if (falg){
            TaskBto taskBto = trainTaskService.selectFatherIsNullAndBillidAndBillType(testPaper.getTrainId(), BusinessEnum.TRAIN.id);
            taskService.moveToSpecial(taskBto,StatusEnum.TRAIN1007,0);
            TrainTheme trainTheme= trainThemeService.findById(testPaper.getTrainId());
            trainTheme.setIsNotExamines(2);
+           trainTheme.setTrainStatus(StatusEnum.TRAIN1007.id);
            trainThemeService.save(trainTheme);
         }
         return ResponseEntity.ok(testPaper);

dev-train/src/main/java/com/tykj/dev/device/train/entity/vo/WaitExaminesVo.java

@@ -133,7 +133,6 @@ public class WaitExaminesVo {
 
     private GenerateTestPaper generateTestPaper;
 
-
     private Integer isNot=0;
 
 }