[培训业务] bug 修改

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

@@ -323,9 +323,9 @@ public class TrainJobController {
 
         //判断是否为线上培训 如是 则任务发给个人 如不是 则给单位推送任务。
         if (trainTheme.getTrainType()==1) {
-//            trainTaskService.selectBillidAndBillType(trainId, BusinessEnum.TRAIN_SIGN_UP.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)
@@ -425,7 +425,7 @@ public class TrainJobController {
         trainUser.setOnlineStatus(2);
         trainUserDao.save(trainUser);
         TaskBto taskBto = taskService.get(testPaper.getTaskId());
-        taskService.moveToSpecial(taskBto,StatusEnum.TRAIN1012,-1);
+        taskService.moveToSpecial(taskBto,StatusEnum.TRAIN1013,-1);
         testPaper = testPaperDao.save(testPaper);
         return ResponseEntity.ok(testPaper);
     }
@@ -452,6 +452,8 @@ public class TrainJobController {
         trainUser.setScore(testPaper.getCountScore().toString());
         trainUser.setOnlineStatus(3);
         trainUserDao.save(trainUser);
+        TaskBto testPaperTaskBto = taskService.get(testPaper.getTaskId());
+        taskService.moveToEnd(testPaperTaskBto);
         testPaper = testPaperDao.save(testPaper);
         List<TestPaper> testPapers= testPaperService.findByTrainIdAndStatus(testPaper.getTrainId(),0);
         if (testPapers==null||testPapers.size()==0){
@@ -484,7 +486,6 @@ public class TrainJobController {
     }
 
 
-
     private void automaticReadingTestPaper(TestPaper testPaper){
          TrainTheme trainTheme = trainThemeService.findById(testPaper.getTrainId());
          GenerateTestPaper generateTestPaper =  JacksonUtil.readValue(trainTheme.getGenerateTestPaperString(),GenerateTestPaper.class);
@@ -610,9 +611,9 @@ public class TrainJobController {
         trainTheme.setPass(gradeEntryVo.getPass());
         trainTheme.setGood(gradeEntryVo.getGood());
         trainTheme.setIsCertificate(gradeEntryVo.getIsCertificate());
-        trainTaskService.selectBillidAndBillType(gradeEntryVo.getTrainThemeId(), BusinessEnum.TRAIN.id, StatusEnum.TRAIN1003.id).forEach(
+        trainTaskService.selectBillidAndBillType(gradeEntryVo.getTrainThemeId(), BusinessEnum.TRAIN_SIGN_UP.id, StatusEnum.TRAIN1003.id).forEach(
                 taskBto1 -> {
-//                                taskBto1.setCurrentPoint(0);
+//
                     taskService.moveToSpecial(taskBto1, StatusEnum.TRAIN1009,0);
                 }
         );

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

@@ -224,9 +224,9 @@ public class TrainThemeServiceImpl implements TrainThemeService {
         if (trainUpdateVo.getStartTime() != null) {
             trainTheme.setStartTime(trainUpdateVo.getStartTime());
         }
-        if (trainUpdateVo.getTrainDataFileList()!=null&&trainUpdateVo.getTrainDataFileList().size()!=0){
+//        if (trainUpdateVo.getTrainDataFileList()!=null&&trainUpdateVo.getTrainDataFileList().size()!=0){
             trainTheme.setTrainDataFiles(FilesUtil.stringFileToList(trainUpdateVo.getTrainDataFileList()));
-        }
+//        }
         if (trainUpdateVo.getTrainLocation() != null) {
             trainTheme.setTrainLocation(trainUpdateVo.getTrainLocation());
         }