3.2.4 卷袋贴默认字段

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

@@ -307,7 +307,7 @@ public class CreatePdfUtil {
 
         boolean isTag = false;
         for (ExamDetailCourse detailCourse : examDetailCourseList) {
-            ExamTask examTask = examTaskService.getByCourseCodeAndPaperNumber(examDetail.getSchoolId(),examId, detailCourse.getCourseCode(), detailCourse.getPaperNumber());
+            ExamTask examTask = examTaskService.getByCourseCodeAndPaperNumber(examDetail.getSchoolId(), examId, detailCourse.getCourseCode(), detailCourse.getPaperNumber());
             ExamTaskDetail examTaskDetail = examTaskDetailService.getByExamTaskId(examTask.getId());
             List<JSONObject> objectList = JSON.parseArray(examTaskDetail.getPaperAttachmentIds(), JSONObject.class);
             for (JSONObject jsonObject : objectList) {
@@ -462,25 +462,27 @@ public class CreatePdfUtil {
                     basicMap.put("name", name);
                     basicMap.put("value", String.join(SystemConstant.COMMA_OF_CHINESE, stringSet));
                     basicPlate.add(basicMap);
-                } else if ("examCount".equals(code)) {
-                    Map<String, String> basicMap = new HashMap<>();
-                    basicMap.put("code", code);
-                    basicMap.put("name", name);
-                    basicMap.put("value", String.valueOf(examStudentList.size()));
-                    basicPlate.add(basicMap);
-                } else if ("actualExamCount".equals(code)) {
-                    Map<String, String> basicMap = new HashMap<>();
-                    basicMap.put("code", code);
-                    basicMap.put("name", name);
-                    basicMap.put("value", "");
-                    basicPlate.add(basicMap);
-                } else if ("paperCount".equals(code)) {
-                    Map<String, String> basicMap = new HashMap<>();
-                    basicMap.put("code", code);
-                    basicMap.put("name", name);
-                    basicMap.put("value", examStudentList.size() + " + " + printCount);
-                    basicPlate.add(basicMap);
-                } else {
+                }
+//                else if ("examCount".equals(code)) {
+//                    Map<String, String> basicMap = new HashMap<>();
+//                    basicMap.put("code", code);
+//                    basicMap.put("name", name);
+//                    basicMap.put("value", String.valueOf(examStudentList.size()));
+//                    basicPlate.add(basicMap);
+//                } else if ("actualExamCount".equals(code)) {
+//                    Map<String, String> basicMap = new HashMap<>();
+//                    basicMap.put("code", code);
+//                    basicMap.put("name", name);
+//                    basicMap.put("value", "");
+//                    basicPlate.add(basicMap);
+//                } else if ("paperCount".equals(code)) {
+//                    Map<String, String> basicMap = new HashMap<>();
+//                    basicMap.put("code", code);
+//                    basicMap.put("name", name);
+//                    basicMap.put("value", examStudentList.size() + " + " + printCount);
+//                    basicPlate.add(basicMap);
+//                }
+                else {
                     // 扩展字段走本校验，进行数据组装
                     Set<String> extendFieldsSet = examStudentList.stream().map(ExamStudentCourseDto::getExtendFields).collect(Collectors.toSet());
                     Set<String> finalSet = new HashSet<>();
@@ -497,6 +499,24 @@ public class CreatePdfUtil {
                 }
             }
         }
+        Map<String, String> basicMap1 = new HashMap<>();
+        basicMap1.put("code", "paperCount");
+        basicMap1.put("name", "试卷数量");
+        basicMap1.put("value", examStudentList.size() + " + " + printCount);
+        basicPlate.add(basicMap1);
+
+        Map<String, String> basicMap2 = new HashMap<>();
+        basicMap2.put("code", "examCount");
+        basicMap2.put("name", "应考人数");
+        basicMap2.put("value", String.valueOf(examStudentList.size()));
+        basicPlate.add(basicMap2);
+
+        Map<String, String> basicMap3 = new HashMap<>();
+        basicMap3.put("code", "actualExamCount");
+        basicMap3.put("name", "实考人数");
+        basicMap3.put("value", "");
+        basicPlate.add(basicMap3);
+
         pdfPackageDto.setBasicPlate(basicPlate);
         printCommonService.saveAttachmentPackagePdf(pdfPackageDto, examDetail, variablePdfList, printCount, fileTempList);
     }