Merge remote-tracking branch 'origin/dev' into dev

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/ExaminationDBFieldsEnum.java

@@ -19,7 +19,6 @@ public enum ExaminationDBFieldsEnum {
     EXAM_ROOM("考场", "examRoom", 10),
     EXAM_DATE("考试日期", "examDate", 0),
     EXAM_TIME("考试时间", "examTime", 0),
-    AGE("年龄", "age", 0),
     PAPER_NUMBER("试卷编号", "paperNumber", 15);
     private final String desc;
     private final String code;

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

@@ -247,12 +247,12 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
             throw ExceptionResultEnum.ERROR.exception("要删除的项目计划不存在");
         }
         // TODO: 2021/4/23 只有新建能删除  && !PrintPlanStatusEnum.READY.equals(examPrintPlan.getStatus())
-//        if (!PrintPlanStatusEnum.NEW.equals(examPrintPlan.getStatus())) {
-//            throw ExceptionResultEnum.ERROR.exception("只有'新建'状态的项目计划可以被删除");
-//        }
-        if (!PrintPlanStatusEnum.NEW.equals(examPrintPlan.getStatus()) && !PrintPlanStatusEnum.READY.equals(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("只有'新建'和就绪状态的项目计划可以被删除");
+//        }
         examDetailService.deleteExaminationData(id);
         return this.removeById(id);
     }