3.2.4 江西中医药卷袋贴bug

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

@@ -526,7 +526,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                     if (Objects.nonNull(type) && Objects.equals(type.toUpperCase(), "SIGN")) {//签到表
                         createPdfUtil.createSignBook(templateId, basicSchool.getName(), examDetail, examStudentCourseDtoList, list[1], (Integer) jsonObjectVariable.get("backupCount"), examDetailCourseList, fileTempList);
                     } else if (Objects.nonNull(type) && Objects.equals(type.toUpperCase(), "PACKAGE")) {//卷袋贴
-                        createPdfUtil.createPaperPackage(templateId, basicSchool.getName(), examDetail, examStudentCourseDtoList, list[1], (Integer) jsonObjectVariable.get("backupCount"), examDetailCourseList, examPrintPlan.getExamId(), fileTempList);
+                        createPdfUtil.createPaperPackage(templateId, basicSchool.getName(), examDetail, examStudentCourseDtoList, list[1], examPrintPlan.getBackupCount(), (Integer) jsonObjectVariable.get("backupCount"), examDetailCourseList, examPrintPlan.getExamId(), fileTempList);
                     }
                 }
             }

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

@@ -293,7 +293,7 @@ public class CreatePdfUtil {
      * @param examDetailCourseList
      * @param fileTempList
      */
-    public void createPaperPackage(Long templateId, String schoolName, ExamDetail examDetail, List<ExamStudentCourseDto> examStudentList, List<PdfDto> variablePdfList, Integer printCount, List<ExamDetailCourse> examDetailCourseList, Long examId, List<File> fileTempList) {
+    public void createPaperPackage(Long templateId, String schoolName, ExamDetail examDetail, List<ExamStudentCourseDto> examStudentList, List<PdfDto> variablePdfList, Integer backupCount, Integer printCount, List<ExamDetailCourse> examDetailCourseList, Long examId, List<File> fileTempList) {
         BasicTemplate basicTemplate = basicTemplateService.getById(templateId);
         if (Objects.isNull(basicTemplate)) {
             throw ExceptionResultEnum.ERROR.exception("印品数据有误");
@@ -417,13 +417,13 @@ public class CreatePdfUtil {
                     basicMap.put("name", name);
                     basicMap.put("value", String.join(SystemConstant.COMMA_OF_CHINESE, paperNumbers));
                     basicPlate.add(basicMap);
-                } else if ("examPlace".equals(code)) {
+                } else if ("examPlace".equals(code) || "campusName".equals(code)) {
                     Map<String, String> basicMap = new HashMap<>();
                     basicMap.put("code", code);
                     basicMap.put("name", name);
                     basicMap.put("value", examDetail.getExamPlace());
                     basicPlate.add(basicMap);
-                } else if ("examRoom".equals(code)) {
+                } else if ("examRoom".equals(code) || "examClassroomName".equals(code)) {
                     Map<String, String> basicMap = new HashMap<>();
                     basicMap.put("code", code);
                     basicMap.put("name", name);
@@ -502,7 +502,7 @@ public class CreatePdfUtil {
         Map<String, String> basicMap1 = new HashMap<>();
         basicMap1.put("code", "paperCount");
         basicMap1.put("name", "试卷数量");
-        basicMap1.put("value", examStudentList.size() + " + " + printCount);
+        basicMap1.put("value", examStudentList.size() + " + " + backupCount);
         basicPlate.add(basicMap1);
 
         Map<String, String> basicMap2 = new HashMap<>();