客户端bug修改

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

@@ -210,9 +210,10 @@ public interface CommonService {
     /**
      * 校验课程关联考场是否提交打印
      * @param schoolId
+     * @param printPlanId
      * @param courseCode
      * @param paperNumber
      * @return
      */
-    Boolean checkExamDetailStatus(Long schoolId, String courseCode, String paperNumber);
+    Boolean checkExamDetailStatus(Long schoolId, Long printPlanId, String courseCode, String paperNumber);
 }

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

@@ -740,8 +740,13 @@ public class CommonServiceImpl implements CommonService {
     }
 
     @Override
-    public Boolean checkExamDetailStatus(Long schoolId, String courseCode, String paperNumber) {
-        List<ExamDetail> examDetails = examDetailService.listByCourseCodeAndPaperNumber(schoolId, courseCode, paperNumber);
+    public Boolean checkExamDetailStatus(Long schoolId, Long printPlanId, String courseCode, String paperNumber) {
+        List<ExamDetail> examDetails;
+        if(printPlanId != null) {
+            examDetails = examDetailService.listByPrintPlanIdAndCourseCodeAndPaperNumber(schoolId, printPlanId, courseCode, paperNumber);
+        } else {
+            examDetails = examDetailService.listByCourseCodeAndPaperNumber(schoolId, courseCode, paperNumber);
+        }
         if (examDetails != null && examDetails.size() > 0) {
             long count = examDetails.stream().filter(m->!ExamDetailStatusEnum.NEW.name().equals(m.getStatus().name()) && !ExamDetailStatusEnum.READY.name().equals(m.getStatus().name())).count();
             if(count > 0){

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

@@ -142,7 +142,7 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
         }
         ExamTask examTask = examTaskService.getById(paperParam.getExamTaskId());
         // 校验课程关联考场，是否已经提交打印
-        Boolean isCreate = commonService.checkExamDetailStatus(examTask.getSchoolId(), examTask.getCourseCode(), examTask.getPaperNumber());
+        Boolean isCreate = commonService.checkExamDetailStatus(examTask.getSchoolId(), examPrintPlan.getId(), examTask.getCourseCode(), examTask.getPaperNumber());
         if (isCreate) {
             // 提交印刷的考场，不允许修改关联试卷
             List<ExamDetail> examDetails = examDetailService.listByPrintPlanIdAndCourseCodeAndPaperNumber(examTask.getSchoolId(), paperParam.getPrintPlanId(), examTask.getCourseCode(), examTask.getPaperNumber());

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

@@ -434,7 +434,7 @@ public class CreatePdfUtil {
             if (lock) {
                 try {
                     paperType = CreatePdfCacheUtil.getPaperType(key);
-                    if (Objects.isNull(paperType) || !unexposedPaperType.contains(paperType)) {
+                    if (Objects.isNull(paperType) || (StringUtils.isNotBlank(unexposedPaperType) && !unexposedPaperType.contains(paperType))) {
                         if (drawRule == DrawRuleEnum.ONE) {
                             paperTypes = unexposedPaperType.split(",");
                         } else {

distributed-print/src/main/java/com/qmth/distributed/print/api/ClientController.java

@@ -321,7 +321,6 @@ public class ClientController {
                                     @RequestParam("isPrint") Boolean isPrint,
                                     @RequestParam(value = "printUser", required = false) String printUser) {
         Map<String, Object> map = clientService.getPrintData(examDetailId, machineCode, isPrint, printUser);
-        System.out.println("result:"+ JSONObject.toJSONString(map));
         return ResultUtil.ok(map);
     }
 

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamTaskController.java

@@ -478,7 +478,7 @@ public class ExamTaskController {
             SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
             ExamTask examTask = examTaskService.getById(examTaskDetail.getId());
             // 校验课程关联考场，是否已经提交打印
-            Boolean isCreate = commonService.checkExamDetailStatus(examTask.getSchoolId(), examTask.getCourseCode(), examTask.getPaperNumber());
+            Boolean isCreate = commonService.checkExamDetailStatus(examTask.getSchoolId(), null, examTask.getCourseCode(), examTask.getPaperNumber());
             // 校验是否可以提交打印状态
             if(isCreate) {
                 commonService.checkData(examTask.getSchoolId(), examTask.getCourseCode(), examTask.getPaperNumber(), sysUser);
@@ -504,7 +504,7 @@ public class ExamTaskController {
             } else {
                 SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
                 // 校验课程关联考场，是否已经提交打印
-                Boolean isCreate = commonService.checkExamDetailStatus(examTask.getSchoolId(), examTask.getCourseCode(), examTask.getPaperNumber());
+                Boolean isCreate = commonService.checkExamDetailStatus(examTask.getSchoolId(), null, examTask.getCourseCode(), examTask.getPaperNumber());
                 // 校验是否可以提交打印状态
                 if(isCreate) {
                     commonService.checkData(examTask.getSchoolId(), examTask.getCourseCode(), examTask.getPaperNumber(), sysUser);