Merge remote-tracking branch 'origin/dev_v3.0.0' into dev_v3.0.0

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

@@ -1853,12 +1853,12 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         }
 
         // 2.ExamRoomInfo 部分
-        List<PrintPlanStatusEnum> printPlanStatusEnumList = new ArrayList<>();
-        printPlanStatusEnumList.add(PrintPlanStatusEnum.PRINTING);
-        printPlanStatusEnumList.add(PrintPlanStatusEnum.PRINT_FINISH);
+//        List<PrintPlanStatusEnum> printPlanStatusEnumList = new ArrayList<>();
+//        printPlanStatusEnumList.add(PrintPlanStatusEnum.PRINTING);
+//        printPlanStatusEnumList.add(PrintPlanStatusEnum.PRINT_FINISH);
         List<ExamPackageDetail> examPackageDetailDatasource = this.baseMapper.findExamPackageDetailByPaperNumber(schoolId, examTask.getExamId(), examTask.getCourseCode(), paperNumber, null);
         if (examPackageDetailDatasource.size() == 0) {
-            throw ExceptionResultEnum.ERROR.exception("任务处理中，请稍后查看！");
+            throw ExceptionResultEnum.ERROR.exception("缺少该命题任务对应的考务数据");
         }
         ExamObjectDto examObjectDto = this.buildExamObjectDtoByPackageDatasource(examPackageDetailDatasource);
 
@@ -2080,21 +2080,20 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                         }
                     }
                 }
+                printCount = studentCount + " + " + backupCount;
+                printTotalCount = printTotalCount + studentCount + backupCount;
 
+                // 组装examRoom
+                ExamRoomInfo examRoomInfo = new ExamRoomInfo();
+                examRoomInfo.setPackageCode(packageCode);
                 if (!CollectionUtils.isEmpty(clazzIds)) {
                     classNames = examDetailService.findClazzNamesByClazzIds(clazzIds, separator);
-                    printCount = studentCount + " + " + backupCount;
-                    printTotalCount = printTotalCount + studentCount + backupCount;
-
-                    // 组装examRoom
-                    ExamRoomInfo examRoomInfo = new ExamRoomInfo();
-                    examRoomInfo.setPackageCode(packageCode);
-                    examRoomInfo.setClazzNames(classNames);
                     examRoomInfo.setCampusNames(basicCampusService.findCampusNamesByClazzIdList(clazzIds, ","));
-                    examRoomInfo.setStudentCount(studentCount);
-                    examRoomInfo.setPrintCount(printCount);
-                    examRoomInfoList.add(examRoomInfo);
                 }
+                examRoomInfo.setClazzNames(classNames);
+                examRoomInfo.setStudentCount(studentCount);
+                examRoomInfo.setPrintCount(printCount);
+                examRoomInfoList.add(examRoomInfo);
             }
         }
         ExamObjectDto examObjectDto = new ExamObjectDto();