bug

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

@@ -110,17 +110,24 @@ public class ClientServiceImpl implements ClientService {
                 || ExamDetailStatusEnum.READY.name().equals(examDetail.getStatus())) {
             throw ExceptionResultEnum.ERROR.exception("该任务已被撤回");
         }
+
+        ExamPrintPlan examPrintPlan = examPrintPlanService.getById(examDetail.getPrintPlanId());
+        String printContent = examPrintPlan.getPrintContent();
         // 取试卷
         List<Map<String, Object>> examDetailCourses = examDetailCourseService.listByExamDetailId(examDetailId);
         Map<String, Map<String, String>> map = mapCourseUrl(examDetailCourses);
         // 取考生
         List<Map> studentList = examDetailService.listStudentByExamDetailId(schoolId, examDetailId, ticketNumber, type);
         // 生成试卷List
-        finalMap.put("paper", splicePaperContent(studentList, map));
-        // 生成题卡List
-        finalMap.put("card", spliceCardContent(studentList));
+        if (printContent.contains("PAPER")) {
+            finalMap.put("paper", splicePaperContent(studentList, map));
+        }
+        if (printContent.contains("CARD")) {
+            // 生成题卡List
+            finalMap.put("card", spliceCardContent(studentList));
+        }
         //
-        ExamPrintPlan examPrintPlan = examPrintPlanService.getById(examDetail.getPrintPlanId());
+
         String variableContent = examPrintPlan.getVariableContent();
         String ordinaryContent = examPrintPlan.getOrdinaryContent();
         List<Map> variableList = JSONObject.parseArray(variableContent, Map.class);