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/ExamTaskDetailServiceImpl.java

@@ -323,6 +323,7 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
                     }
                 }
             }
+            paperList = paperList.stream().distinct().collect(Collectors.toList());
             return paperList;
         }
         return null;

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

@@ -1641,8 +1641,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                 examDetail.setOrgId(sysUser.getOrgId());
                 examDetail.setPrintPlanId(examPrintPlan.getId());
                 examDetail.setPrintPlanName(examPrintPlan.getName());
-                examDetail.setExamPlace("考场" + i);
-                examDetail.setExamRoom("考点" + i);
+                examDetail.setExamPlace("考点" + i);
+                examDetail.setExamRoom("考场" + i);
                 examDetail.setStatus(ExamDetailStatusEnum.NEW);
                 examDetail.setExamStartTime(examDetailParams.getExamStartTime());
                 examDetail.setExamEndTime(examDetailParams.getExamEndTime());

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

@@ -288,7 +288,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                             + "_" + examDetail.getExamEndTime()
                             + "_" + examDetailCourse.getCourseCode()
                             + "_" + examDetailCourse.getPaperNumber();
-                    String paperType = null;
+                    String paperType;
                     if (Objects.nonNull(paperTypeParam)) {
                         paperType = paperTypeParam;
                         CreatePdfCacheUtil.setPaperType(key, paperType);

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/CreatePdfUtil.java

@@ -508,28 +508,29 @@ public class CreatePdfUtil {
         String unexposedPaperType = examTaskDetail.getUnexposedPaperType();
         //已曝光卷型
         String exposedPaperType = examTaskDetail.getExposedPaperType();
-        // 单次抽取套数
-        int drawCount = examTaskDetail.getDrawCount().intValue();
+
         if (drawRule == DrawRuleEnum.ONE) {
             if (Objects.isNull(unexposedPaperType) || Objects.equals(unexposedPaperType.trim(), "")) {
-                CreatePdfCacheUtil.deletePaperType(key);
+//                CreatePdfCacheUtil.deletePaperType(key);
                 throw ExceptionResultEnum.PAPER_ERROR.exception();
             }
         } else {
             if ((Objects.isNull(exposedPaperType) || Objects.equals(exposedPaperType.trim(), "")) && (Objects.isNull(unexposedPaperType) || Objects.equals(unexposedPaperType.trim(), ""))) {
-                CreatePdfCacheUtil.deletePaperType(key);
+//                CreatePdfCacheUtil.deletePaperType(key);
                 throw ExceptionResultEnum.PAPER_ERROR.exception();
             }
         }
+        // 单次抽取套数
+        int drawCount = examTaskDetail.getDrawCount().intValue();
         String paperType = null;
-        String[] paperTypes = null;
+        String[] paperTypes;
         boolean lock = true;
         for (int i = 0; i < SystemConstant.MAX_RETRY_COUNT; i++) {
             lock = redisUtil.lock(key, SystemConstant.REDIS_CACHE_TIME_OUT);
             if (lock) {
                 try {
                     paperType = CreatePdfCacheUtil.getPaperType(key);
-                    if (Objects.isNull(paperType) || (StringUtils.isNotBlank(unexposedPaperType) && !unexposedPaperType.contains(paperType))) {
+                    if (StringUtils.isBlank(paperType)) {
                         if (drawRule == DrawRuleEnum.ONE) {
                             paperTypes = unexposedPaperType.split(",");
                             if (paperTypes.length - drawCount < 0) {