bug fix

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

@@ -75,7 +75,7 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
         List<PrintPlanResult> list = page.getRecords();
         for (PrintPlanResult printPlanResult : list) {
             List<Map> variableContent = JSONObject.parseArray(printPlanResult.getVariableContentTemp(), Map.class);
-            List<Map> ordinaryContent = JSONObject.parseArray(printPlanResult.getOrdinaryContentTemp(),Map.class);
+            List<Map> ordinaryContent = JSONObject.parseArray(printPlanResult.getOrdinaryContentTemp(), Map.class);
             printPlanResult.setVariableContent(variableContent);
             printPlanResult.setOrdinaryContent(ordinaryContent);
 
@@ -142,7 +142,7 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
         for (ClassifyEnum value : ClassifyEnum.values()) {
             Map<String, Object> variableMap = new HashMap<>();
             List<TemplatePrintInfoResult> sourceList = variableList.stream().filter(e -> value.equals(e.getTemplateClassify())).collect(Collectors.toList());
-            List<Map<String,Object>> templateList = new ArrayList<>();
+            List<Map<String, Object>> templateList = new ArrayList<>();
             for (TemplatePrintInfoResult templatePrintInfoResult : sourceList) {
                 Map<String, Object> printMap = new HashMap<>();
                 printMap.put("id", String.valueOf(templatePrintInfoResult.getTemplateId()));
@@ -150,9 +150,9 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
                 printMap.put("attachmentId", templatePrintInfoResult.getAttachmentId().toString());
                 templateList.add(printMap);
             }
-            if (templateList.size() > 0){
-                variableMap.put("type",value);
-                variableMap.put("template",templateList);
+            if (templateList.size() > 0) {
+                variableMap.put("type", value);
+                variableMap.put("template", templateList);
                 variable.add(variableMap);
             }
         }
@@ -165,7 +165,7 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
         Map<String, Object> ordinaryMap = new HashMap<>();
         for (ClassifyEnum value : ClassifyEnum.values()) {
             List<TemplatePrintInfoResult> sourceList = ordinaryList.stream().filter(e -> value.equals(e.getTemplateClassify())).collect(Collectors.toList());
-            List<Map<String,Object>> templateList = new ArrayList<>();
+            List<Map<String, Object>> templateList = new ArrayList<>();
             for (TemplatePrintInfoResult templatePrintInfoResult : sourceList) {
                 Map<String, Object> printMap = new HashMap<>();
                 printMap.put("id", String.valueOf(templatePrintInfoResult.getTemplateId()));
@@ -173,9 +173,9 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
                 printMap.put("attachmentId", templatePrintInfoResult.getAttachmentId().toString());
                 templateList.add(printMap);
             }
-            if (templateList.size() > 0){
-                ordinaryMap.put("type",value);
-                ordinaryMap.put("template",templateList);
+            if (templateList.size() > 0) {
+                ordinaryMap.put("type", value);
+                ordinaryMap.put("template", templateList);
                 ordinary.add(ordinaryMap);
             }
         }
@@ -193,17 +193,17 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Long id = printPlanParams.getId();
         Long schoolId = printPlanParams.getSchoolId();
-        if (basicSchoolService.list(new QueryWrapper<BasicSchool>().lambda().eq(BasicSchool::getId,schoolId).eq(BasicSchool::getEnable,true)).size() != 1) {
+        if (basicSchoolService.list(new QueryWrapper<BasicSchool>().lambda().eq(BasicSchool::getId, schoolId).eq(BasicSchool::getEnable, true)).size() != 1) {
             throw ExceptionResultEnum.ERROR.exception("输入的学校id不满足条件 schoolId = " + schoolId);
         }
 
         // 校验是否印试卷和题卡
         List<String> printContentList = printPlanParams.getPrintContent();
         BasicExamRule basicExamRule = basicExamRuleService.getBySchoolId(schoolId);
-        if (Objects.isNull(basicExamRule)){
+        if (Objects.isNull(basicExamRule)) {
             throw ExceptionResultEnum.ERROR.exception("未找到学校的通用规则！ schoolId : " + schoolId);
         }
-        if (basicExamRule.getIncludePaper() && !printContentList.contains("PAPER")){
+        if (basicExamRule.getIncludePaper() && !printContentList.contains("PAPER")) {
             throw ExceptionResultEnum.ERROR.exception("学校通用规则设置了强制包含试卷的必须选择试卷印品！ schoolId : " + schoolId);
         }
         if (printContentList.contains("PAPER") && !printContentList.contains("CARD")) {
@@ -224,7 +224,7 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
         } else {
             // 包含印刷计划id -> 编辑印刷计划
             ExamPrintPlan tmp = this.getById(id);
-            if (tmp == null){
+            if (tmp == null) {
                 throw ExceptionResultEnum.ERROR.exception("印刷计划id不存在 id= " + id);
             }
             PrintPlanStatusEnum status = tmp.getStatus();
@@ -243,12 +243,12 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
     public Boolean removePrintPlan(DeleteParams deleteParams) {
         Long id = deleteParams.getId();
         ExamPrintPlan examPrintPlan = this.getById(id);
-        if (examPrintPlan == null){
+        if (examPrintPlan == null) {
             throw ExceptionResultEnum.ERROR.exception("要删除的项目计划不存在 id = " + id);
         }
         // TODO: 2021/4/23 只有新建能删除  && !PrintPlanStatusEnum.READY.equals(examPrintPlan.getStatus())
-        if (!PrintPlanStatusEnum.NEW.equals(examPrintPlan.getStatus())){
-            throw ExceptionResultEnum.ERROR.exception("只有'新建'状态的项目计划可以被删除 status = " + examPrintPlan.getStatus());
+        if (!PrintPlanStatusEnum.NEW.equals(examPrintPlan.getStatus())) {
+            throw ExceptionResultEnum.ERROR.exception("只有'新建'状态的项目计划可以被删除");
         }
 //        if (!PrintPlanStatusEnum.NEW.equals(examPrintPlan.getStatus()) && !PrintPlanStatusEnum.READY.equals(examPrintPlan.getStatus())){
 //            throw ExceptionResultEnum.ERROR.exception("只有'新建'状态的项目计划可以被删除 status = " + examPrintPlan.getStatus());
@@ -277,13 +277,13 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
 
     @Override
     public IPage<ClientPrintTaskDto> listClientPrintTask(Page<ClientPrintTaskDto> page, Long schoolId, Long machineCode, String printPlanId, String status, String courseCode, String paperNumber, String examPlace, String examRoom, Long examStartTime, Long examEndTime, Boolean isDownload, Boolean validate, Set<Long> orgIds) {
-        return this.baseMapper.listClientPrintTask(page, schoolId,machineCode, printPlanId, status, courseCode, paperNumber, examPlace, examRoom, examStartTime, examEndTime,isDownload,validate, orgIds);
+        return this.baseMapper.listClientPrintTask(page, schoolId, machineCode, printPlanId, status, courseCode, paperNumber, examPlace, examRoom, examStartTime, examEndTime, isDownload, validate, orgIds);
     }
 
 
     @Override
     public List<ClientPrintTaskDto> listClientPrintTask(Long schoolId, Long machineCode, String printPlanId, String status, String courseCode, String paperNumber, String examPlace, String examRoom, Long examStartTime, Long examEndTime, Boolean isDownload, Boolean validate, Set<Long> orgIds) {
-        return this.baseMapper.listClientPrintTask(schoolId,machineCode, printPlanId, status, courseCode, paperNumber, examPlace, examRoom, examStartTime, examEndTime,isDownload,validate, orgIds);
+        return this.baseMapper.listClientPrintTask(schoolId, machineCode, printPlanId, status, courseCode, paperNumber, examPlace, examRoom, examStartTime, examEndTime, isDownload, validate, orgIds);
     }
 
 
@@ -307,12 +307,12 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
         return resultList;
     }
 
-    public Map<String, String> getAttachment(Map map){
+    public Map<String, String> getAttachment(Map map) {
         Map<String, String> fMap = new HashMap<>();
-        fMap.put("type",map.get("type").toString());
+        fMap.put("type", map.get("type").toString());
         String attachmentId = map.get("attachmentId").toString();
         BasicAttachment attachment = basicAttachmentService.getById(attachmentId);
-        if(attachment.getType().equals(".ftl") || attachment.getType().equals(".html")){
+        if (attachment.getType().equals(".ftl") || attachment.getType().equals(".html")) {
             String content = commonService.readFileContent(attachment.getPath());
             fMap.put("content", content);
             fMap.put("utl", null);
@@ -321,7 +321,7 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
 
             Map<String, String> urlMap = commonService.filePreview(attachmentId, false);
             fMap.put("url", urlMap.get("pathUrl"));
-        } else{
+        } else {
             throw ExceptionResultEnum.ERROR.exception("不支持的类型");
         }
         return fMap;