加入处理时限枚举

sop-api/src/main/java/com/qmth/sop/server/api/SysController.java

@@ -539,6 +539,12 @@ public class SysController {
                     map.put(projectExchangeApproveEnum, projectExchangeApproveEnum.getTitle());
                 }
                 break;
+            case PROCESS_LIMITED_ENUM://处理时限枚举类型
+                ProcessLimitedEnum[] processLimitedEnums = ProcessLimitedEnum.values();
+                for (ProcessLimitedEnum processLimitedEnum : processLimitedEnums) {
+                    map.put(processLimitedEnum, processLimitedEnum.getTitle());
+                }
+                break;
             default:
                 break;
         }

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBSopInfoServiceImpl.java

@@ -692,64 +692,64 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
             if (tfCustomFlow.getType() == TFCustomTypeEnum.OFFICE_SOP_FLOW) {//教务处sop
                 if (tfFlowApprove.getSetup().intValue() == 2) {//项目关键信息
                     FlowTaskResult flowTaskResult = this.getFormProperties(tfCustomFlowEntity, 1);
-                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult, SystemConstant.PROJECT_KEY_INFO_DATE);
-                    execField = SystemConstant.PROJECT_KEY_INFO_DATE;
+                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult, ProcessLimitedEnum.PROJECT_KEY_INFO_DATE.getKey());
+                    execField = ProcessLimitedEnum.PROJECT_KEY_INFO_DATE.getKey();
                 } else if (tfFlowApprove.getSetup().intValue() == 3) {//内审
                     processLimitedTime = tfFlowApprove.getUpdateTime();
                 } else if (tfFlowApprove.getSetup().intValue() == 5) {//扫描准备
                     tbSopInfoService.sopDeviceInOutSave(map, 4);
                     FlowTaskResult flowTaskResult = this.getFormProperties(tfCustomFlowEntity, 2);
-                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult, SystemConstant.SCAN_START_TIME);
-                    execField = SystemConstant.SCAN_START_TIME;
+                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult, ProcessLimitedEnum.SCAN_START_TIME.getKey());
+                    execField = ProcessLimitedEnum.SCAN_START_TIME.getKey();
                 } else if (tfFlowApprove.getSetup().intValue() == 7) {//校验收尾
                     FlowTaskResult flowTaskResult = this.getFormProperties(tfCustomFlowEntity, 2);
-                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult, SystemConstant.SCAN_END_TIME);
-                    execField = SystemConstant.SCAN_END_TIME;
+                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult, ProcessLimitedEnum.SCAN_END_TIME.getKey());
+                    execField = ProcessLimitedEnum.SCAN_END_TIME.getKey();
                 } else if (tfFlowApprove.getSetup().intValue() == 8) {//评卷准备
                     FlowTaskResult flowTaskResult = this.getFormProperties(tfCustomFlowEntity, 2);
-                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult, SystemConstant.MARK_START_TIME);
-                    execField = SystemConstant.MARK_START_TIME;
+                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult, ProcessLimitedEnum.MARK_START_TIME.getKey());
+                    execField = ProcessLimitedEnum.MARK_START_TIME.getKey();
                 } else if (tfFlowApprove.getSetup().intValue() == 9) {//评卷收尾
                     FlowTaskResult flowTaskResult = this.getFormProperties(tfCustomFlowEntity, 2);
-                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult, SystemConstant.MARK_END_TIME);
-                    execField = SystemConstant.MARK_END_TIME;
+                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult, ProcessLimitedEnum.MARK_END_TIME.getKey());
+                    execField = ProcessLimitedEnum.MARK_END_TIME.getKey();
                 } else if (tfFlowApprove.getSetup().intValue() == 10) {//设备入库登记
                     FlowTaskResult flowTaskResult = this.getFormProperties(tfCustomFlowEntity, 1);
-                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult, SystemConstant.SERVICE_FINISH_PLAN_DATE);
-                    execField = SystemConstant.SERVICE_FINISH_PLAN_DATE;
+                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult, ProcessLimitedEnum.SERVICE_FINISH_PLAN_DATE.getKey());
+                    execField = ProcessLimitedEnum.SERVICE_FINISH_PLAN_DATE.getKey();
                 }
             } else if (tfCustomFlow.getType() == TFCustomTypeEnum.CLOUD_MARK_SOP_FLOW) {//研究生sop
                 if (tfFlowApprove.getSetup().intValue() == 2) {//项目关键信息
                     FlowTaskResult flowTaskResult = this.getFormProperties(tfCustomFlowEntity, 1);
-                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult, SystemConstant.PROJECT_KEY_INFO_DATE);
-                    execField = SystemConstant.PROJECT_KEY_INFO_DATE;
+                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult, ProcessLimitedEnum.PROJECT_KEY_INFO_DATE.getKey());
+                    execField = ProcessLimitedEnum.PROJECT_KEY_INFO_DATE.getKey();
                 } else if (tfFlowApprove.getSetup().intValue() == 3) {//内审
                     processLimitedTime = tfFlowApprove.getUpdateTime();
                 } else if (tfFlowApprove.getSetup().intValue() == 4) {//环境部署时间
                     FlowTaskResult flowTaskResult = this.getFormProperties(tfCustomFlowEntity, 2);
-                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult, SystemConstant.ENV_DEPLOYMENT_TIME);
-                    execField = SystemConstant.ENV_DEPLOYMENT_TIME;
+                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult, ProcessLimitedEnum.ENV_DEPLOYMENT_TIME.getKey());
+                    execField = ProcessLimitedEnum.ENV_DEPLOYMENT_TIME.getKey();
                 } else if (tfFlowApprove.getSetup().intValue() == 6) {//扫描准备
                     tbSopInfoService.sopDeviceInOutSave(map, 5);
                     FlowTaskResult flowTaskResult = this.getFormProperties(tfCustomFlowEntity, 2);
-                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult, SystemConstant.SCAN_START_TIME);
-                    execField = SystemConstant.SCAN_START_TIME;
+                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult, ProcessLimitedEnum.SCAN_START_TIME.getKey());
+                    execField = ProcessLimitedEnum.SCAN_START_TIME.getKey();
                 } else if (tfFlowApprove.getSetup().intValue() == 7) {//校验收尾
                     FlowTaskResult flowTaskResult = this.getFormProperties(tfCustomFlowEntity, 2);
-                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult, SystemConstant.SCAN_END_TIME);
-                    execField = SystemConstant.SCAN_END_TIME;
+                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult, ProcessLimitedEnum.SCAN_END_TIME.getKey());
+                    execField = ProcessLimitedEnum.SCAN_END_TIME.getKey();
                 } else if (tfFlowApprove.getSetup().intValue() == 8) {//评卷准备
                     FlowTaskResult flowTaskResult = this.getFormProperties(tfCustomFlowEntity, 2);
-                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult, SystemConstant.MARK_START_TIME);
-                    execField = SystemConstant.MARK_START_TIME;
+                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult, ProcessLimitedEnum.MARK_START_TIME.getKey());
+                    execField = ProcessLimitedEnum.MARK_START_TIME.getKey();
                 } else if (tfFlowApprove.getSetup().intValue() == 9) {//成绩复核
                     FlowTaskResult flowTaskResult = this.getFormProperties(tfCustomFlowEntity, 2);
-                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult, SystemConstant.MARK_END_TIME);
-                    execField = SystemConstant.MARK_END_TIME;
+                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult, ProcessLimitedEnum.MARK_END_TIME.getKey());
+                    execField = ProcessLimitedEnum.MARK_END_TIME.getKey();
                 } else if (tfFlowApprove.getSetup().intValue() == 11) {//设备入库登记
                     FlowTaskResult flowTaskResult = this.getFormProperties(tfCustomFlowEntity, 1);
-                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult, SystemConstant.SERVICE_FINISH_PLAN_DATE);
-                    execField = SystemConstant.SERVICE_FINISH_PLAN_DATE;
+                    processLimitedTime = this.getProcessLimitedTime(flowTaskResult, ProcessLimitedEnum.SERVICE_FINISH_PLAN_DATE.getKey());
+                    execField = ProcessLimitedEnum.SERVICE_FINISH_PLAN_DATE.getKey();
                 }
             }
             if (Objects.nonNull(execField)) {

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBViolationServiceImpl.java

@@ -84,7 +84,7 @@ public class TBViolationServiceImpl extends ServiceImpl<TBViolationMapper, TBVio
         try {
             SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
             if (Objects.isNull(tBViolation.getId())) {// 新增
-                tBViolation.setCode(sequenceService.createCode(DelayWarnSeqTypeEnum.VIOLATION_WARN.getCode()));
+                tBViolation.setCode(DelayWarnSeqTypeEnum.VIOLATION_WARN.getMark() + sequenceService.createCode(DelayWarnSeqTypeEnum.VIOLATION_WARN.getCode()));
                 tBViolation.insertInfo(sysUser.getId());
                 saveOrUpdate(tBViolation);
                 TBViolationResult tbViolationResult = getByCode(tBViolation.getCode());

sop-common/src/main/java/com/qmth/sop/common/contant/SystemConstant.java

@@ -135,26 +135,11 @@ public class SystemConstant {
     public static final String APPROVE_REMARK_REGION = "approve_remark_region";
     public static final String SIGN_REGION = "sign_region";
 
-    /**
-     * 教务处SOP处理时限字段
-     */
-    public static final String PROJECT_KEY_INFO_DATE = "project_key_info_date";//项目关键信息提交截止时间
-    public static final String SCAN_START_TIME = "scan_start_time";//扫描开始时间
-    public static final String SCAN_END_TIME = "scan_end_time";//扫描结束时间
-    public static final String MARK_START_TIME = "mark_start_time";//评卷开始时间
-    public static final String MARK_END_TIME = "mark_end_time";//评卷结束时间
-    public static final String SERVICE_FINISH_PLAN_DATE = "service_finish_plan_date";//现场服务完成撤场计划时间
-
     public static final String DEVICE_OUT_TIME = "device_out_time";//设备出库时间
     public static final String DEVICE_OUT_TABLE = "device_out_table";//设备出库
     public static final String DEVICE_IN_TIME = "device_in_time";//设备入库时间
     public static final String DEVICE_IN_TABLE = "device_in_table";//设备入库
 
-    /**
-     * 研究生SOP处理时限字段
-     */
-    public static final String ENV_DEPLOYMENT_TIME = "env_deployment_time";//环境部署时间
-
     //质量问题反馈
     public static final String PROBLEM_POINT = "problem_point";
     public static final String PROBLEM_REMARK = "problem_remark";

sop-common/src/main/java/com/qmth/sop/common/enums/DelayWarnSeqTypeEnum.java

@@ -9,17 +9,24 @@ package com.qmth.sop.common.enums;
  */
 public enum DelayWarnSeqTypeEnum {
 
-    VIOLATION_WARN("violationWarn", "violationWarn"),
+    VIOLATION_WARN("violationWarn", "violationWarn", "V"),
 
-    DELAY_WARN("项目取消", "delayWarn");
+    DELAY_WARN("项目取消", "delayWarn", "W");
 
     private String title;
 
     private String code;
 
-    private DelayWarnSeqTypeEnum(String title, String code) {
+    private String mark;
+
+    private DelayWarnSeqTypeEnum(String title, String code, String mark) {
         this.title = title;
         this.code = code;
+        this.mark = mark;
+    }
+
+    public String getMark() {
+        return mark;
     }
 
     public String getTitle() {

sop-common/src/main/java/com/qmth/sop/common/enums/EnumList.java

@@ -49,7 +49,9 @@ public enum EnumList {
 
     PROJECT_EXCHANGE_FLOW_STATUS_ENUM(ProjectExchangeFlowStatusEnum.class),
 
-    PROJECT_EXCHANGE_APPROVE_ENUM(ProjectExchangeApproveEnum.class);
+    PROJECT_EXCHANGE_APPROVE_ENUM(ProjectExchangeApproveEnum.class),
+
+    PROCESS_LIMITED_ENUM(ProcessLimitedEnum.class);
 
     private Object obj;
 

sop-common/src/main/java/com/qmth/sop/common/enums/ProcessLimitedEnum.java

@@ -0,0 +1,43 @@
+package com.qmth.sop.common.enums;
+
+/**
+ * @Description: 处理时限枚举
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2023/10/14
+ */
+public enum ProcessLimitedEnum {
+
+    PROJECT_KEY_INFO_DATE("project_key_info_date", "项目关键信息提交截止时间"),
+
+    SCAN_START_TIME("project_key_info_date", "扫描开始时间"),
+
+    SCAN_END_TIME("scan_end_time", "扫描结束时间"),
+
+    MARK_START_TIME("mark_start_time", "评卷开始时间"),
+
+    MARK_END_TIME("mark_end_time", "评卷结束时间"),
+
+    SERVICE_FINISH_PLAN_DATE("service_finish_plan_date", "现场服务完成撤场计划时间"),
+
+    ENV_DEPLOYMENT_TIME("env_deployment_time", "环境部署时间");
+
+    private String key;
+
+    private String title;
+
+
+    private ProcessLimitedEnum(String key, String title) {
+        this.key = key;
+        this.title = title;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+}

sop-task/src/main/java/com/qmth/sop/task/listener/MyJobListener.java

@@ -70,7 +70,7 @@ public class MyJobListener implements JobListener {
                             TBSopInfo tbSopInfo = tbSopInfoService.getById(tfCustomFlowEntity.getObjId());
                             Optional.ofNullable(tbSopInfo).orElseThrow(() -> ExceptionResultEnum.SOP_INFO_NO_DATA.exception());
 
-                            String code = sequenceService.createCode(DelayWarnSeqTypeEnum.DELAY_WARN.getCode());
+                            String code = DelayWarnSeqTypeEnum.DELAY_WARN.getMark() + sequenceService.createCode(DelayWarnSeqTypeEnum.DELAY_WARN.getCode());
                             tbDelayWarnService.save(new TBDelayWarn(tbSopInfo.getCrmNo(), tbSopInfo.getSopNo(), tbSopInfo.getServiceId(), code, tsJobLog.getCreateTime(), tsJobLog.getCreateId(), tsJobRemind.getExecField()));
                         }
                     }