3.2.7 bug修改

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

@@ -252,8 +252,16 @@ public class TaskLogicServiceImpl implements TaskLogicService {
             }
             //查询命题任务绑定的试卷和题卡
             ExamTask examTask = examTaskService.getByCourseCodeAndPaperNumber(sysUser.getSchoolId(), examPrintPlan.getExamId(), examDetailCourse.getCourseCode(), examDetailCourse.getPaperNumber());
-            if (examTask.getReview()) {
+            if (examTask == null) {
+                throw ExceptionResultEnum.EXAM_TASK_IS_NULL.exception();
+            } else if (examTask.getReview()) {
                 examTask = examTaskService.findExamTaskByFlowStatus(sysUser.getSchoolId(), examPrintPlan.getExamId(), examDetailCourse.getCourseCode(), examDetailCourse.getPaperNumber(), FlowStatusEnum.FINISH);
+            } else {
+                if (!ExamStatusEnum.SUBMIT.equals(examTask.getStatus())) {
+                    throw ExceptionResultEnum.EXAM_TASK_NOT_SUBMIT.exception();
+                } else if (!examTask.getEnable()) {
+                    throw ExceptionResultEnum.EXAM_TASK_ENABLE.exception();
+                }
             }
             ExamTaskDetail examTaskDetail = examTaskDetailService.getByExamTaskId(examTask.getId());
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/ExceptionResultEnum.java

@@ -78,6 +78,7 @@ public enum ExceptionResultEnum {
     EXAM_CARD_IS_NULL(HttpStatus.INTERNAL_SERVER_ERROR, 50000028, "题卡为空"),
 
     EXAM_TASK_IS_NULL(HttpStatus.INTERNAL_SERVER_ERROR, 50000029, "命题任务为空或未找到审核通过记录"),
+    EXAM_TASK_NOT_SUBMIT(HttpStatus.INTERNAL_SERVER_ERROR, 50000030, "命题任务未提交"),
     EXAM_TASK_ENABLE(HttpStatus.INTERNAL_SERVER_ERROR, 50000034, "命题任务已禁用"),
 
     NO_DATA(HttpStatus.INTERNAL_SERVER_ERROR, 5000030, "没有数据"),