Merge remote-tracking branch 'origin/dev_v2.2.0' into dev_v2.2.0

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/DataSyncServiceImpl.java

@@ -120,7 +120,7 @@ public class DataSyncServiceImpl implements DataSyncService {
             throw ExceptionResultEnum.ERROR.exception("请选择需要合并的印刷任务");
         }
 
-        if(Objects.isNull(syncDataParam.getThirdRelateId()) || Objects.isNull(syncDataParam.getThirdRelateName())){
+        if(Objects.isNull(syncDataParam.getThirdRelateId()) && Objects.isNull(syncDataParam.getThirdRelateName())){
             throw ExceptionResultEnum.ERROR.exception("考试ID、考试名称至少填一个");
         }
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskServiceImpl.java

@@ -1763,6 +1763,9 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         printPlanStatusEnumList.add(PrintPlanStatusEnum.PRINTING);
         printPlanStatusEnumList.add(PrintPlanStatusEnum.PRINT_FINISH);
         List<ExamPackageDetail> examPackageDetailDatasource = this.baseMapper.findExamPackageDetailByPaperNumber(schoolId,examTask.getCourseCode(),paperNumber, printPlanStatusEnumList);
+        if (examPackageDetailDatasource.size() == 0){
+            throw ExceptionResultEnum.ERROR.exception("任务处理中，请稍后查看！");
+        }
         for (ExamPackageDetail packageDetail : examPackageDetailDatasource) {
             ExamDetailStatusEnum examDetailStatusEnum = packageDetail.getExamDetailStatus();
             if(ExamDetailStatusEnum.NEW.equals(examDetailStatusEnum) || ExamDetailStatusEnum.READY.equals(examDetailStatusEnum)){

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -329,7 +329,6 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                             t.setPaperType(stuPaperType);
                             i++;
                         }
-                        examStudentService.saveOrUpdateBatch(examStudentList);
                         // 试卷
                         list[2].addAll(paperPdfTempList);
                     }
@@ -362,6 +361,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                             examDetailCourse.setAttachmentId(jsonObject.toJSONString());
                         }
                     }
+                    examStudentService.saveOrUpdateBatch(examStudentList);
                 }
                 examDetailCourse.setAttachmentId(jsonObject.toJSONString());
                 examTaskDetailService.saveOrUpdateBatch(examTaskDetailList);

teachcloud-task/src/main/java/com/qmth/teachcloud/task/job/TimedSyncSchoolJob.java

@@ -23,7 +23,7 @@ public class TimedSyncSchoolJob extends QuartzJobBean {
         try {
             jobService.updateSchoolInfo();
             jobService.updatePrintPlan();
-            jobService.syncData();
+//            jobService.syncData();
         } catch (IOException e) {
             e.printStackTrace();
         }

teachcloud-task/src/main/java/com/qmth/teachcloud/task/job/service/impl/JobServiceImpl.java

@@ -97,10 +97,10 @@ public class JobServiceImpl implements JobService {
         examPrintPlanService.saveOrUpdateBatch(examPrintPlanList);
 
         // 2021-05-20 同步数据到云阅卷
-        SysConfig sysConfig = sysConfigService.getByKey("sys.code.enable");
-        if (Objects.nonNull(sysConfig) && sysConfig.getConfigValue() == "true") {
-            dataSyncService.syncToCloudReview();
-        }
+//        SysConfig sysConfig = sysConfigService.getByKey("sys.code.enable");
+//        if (Objects.nonNull(sysConfig) && sysConfig.getConfigValue() == "true") {
+//            dataSyncService.syncToCloudReview();
+//        }
     }
 
     /**