预警字段修改

sop-business/src/main/java/com/qmth/sop/business/bean/result/TBDelayWarnResult.java

@@ -1,12 +1,7 @@
 package com.qmth.sop.business.bean.result;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.sop.business.entity.TBDelayWarn;
 import com.qmth.sop.business.entity.TBDelayWarnDetail;
-import com.qmth.sop.common.base.BaseEntity;
-import com.qmth.sop.common.enums.DelayWarnStatusEnum;
-import com.qmth.sop.common.enums.DelayWarnTypeEnum;
 import com.qmth.sop.common.enums.ProductTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -28,8 +23,6 @@ public class TBDelayWarnResult extends TBDelayWarn implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-
-
     @ApiModelProperty(value = "服务单元")
     private String service;
 
@@ -45,7 +38,6 @@ public class TBDelayWarnResult extends TBDelayWarn implements Serializable {
     @ApiModelProperty(value = "项目名称")
     private String crmName;
 
-
     @ApiModelProperty(value = "创建人")
     private String createName;
 

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

@@ -94,6 +94,12 @@ public class TBDelayWarnServiceImpl extends ServiceImpl<TBDelayWarnMapper, TBDel
         if (Objects.nonNull(fieldObj) && ProcessLimitedEnum.ENV_DEPLOYMENT_TIME.getTitle().contains(fieldObj.trim())) {
             fieldObjList.add(ProcessLimitedEnum.ENV_DEPLOYMENT_TIME.getKey());
         }
+        if (Objects.nonNull(fieldObj) && ProcessLimitedEnum.FLOW_TASK_BEFORE.getTitle().contains(fieldObj.trim())) {
+            fieldObjList.add(ProcessLimitedEnum.FLOW_TASK_BEFORE.getKey());
+        }
+        if (Objects.nonNull(fieldObj) && ProcessLimitedEnum.FLOW_TASK_AFTER.getTitle().contains(fieldObj.trim())) {
+            fieldObjList.add(ProcessLimitedEnum.FLOW_TASK_AFTER.getKey());
+        }
         if (Objects.nonNull(fieldObj) && CollectionUtils.isEmpty(fieldObjList)) {
             fieldObjList.add(fieldObj);
         }

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

@@ -1091,11 +1091,13 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
                         tsJobRemindList.add(new TSJobRemind(JobQuartzTypeEnum.FLOW, tfCustomFlowEntity.getCode(),
                                 Long.parseLong(task.getId()), tfCustomFlow.getType().getTitle() + ";" + task.getName(),
                                 JobTypeEnum.BEFORE, Long.parseLong(task.getAssignee()), tfFlowLog.getApproveOperation(),
-                                processLimitedTime, execField, sysUser.getId(), tfCustomFlowEntity.getCrmNo()));
+                                processLimitedTime, ProcessLimitedEnum.FLOW_TASK_BEFORE.getKey(),
+                                sysUser.getId(), tfCustomFlowEntity.getCrmNo()));
                         tsJobRemindList.add(new TSJobRemind(JobQuartzTypeEnum.FLOW, tfCustomFlowEntity.getCode(),
                                 Long.parseLong(task.getId()), tfCustomFlow.getType().getTitle() + ";" + task.getName(),
                                 JobTypeEnum.AFTER, Long.parseLong(task.getAssignee()), tfFlowLog.getApproveOperation(),
-                                processLimitedTime, execField, sysUser.getId(), tfCustomFlowEntity.getCrmNo()));
+                                processLimitedTime, ProcessLimitedEnum.FLOW_TASK_AFTER.getKey(),
+                                sysUser.getId(), tfCustomFlowEntity.getCrmNo()));
                     } else {
                         List<IdentityLink> identityLinkList = taskService.getIdentityLinksForTask(task.getId());
                         if (!CollectionUtils.isEmpty(identityLinkList)) {
@@ -1105,14 +1107,16 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
                                                 Long.parseLong(i.getTaskId()),
                                                 tfCustomFlow.getType().getTitle() + ";" + task.getName(),
                                                 JobTypeEnum.BEFORE, Long.parseLong(i.getUserId()),
-                                                tfFlowLog.getApproveOperation(), processLimitedTime, execField,
+                                                tfFlowLog.getApproveOperation(), processLimitedTime,
+                                                ProcessLimitedEnum.FLOW_TASK_BEFORE.getKey(),
                                                 sysUser.getId(), tfCustomFlowEntity.getCrmNo()));
                                 tsJobRemindList.add(
                                         new TSJobRemind(JobQuartzTypeEnum.FLOW, tfCustomFlowEntity.getCode(),
                                                 Long.parseLong(i.getTaskId()),
                                                 tfCustomFlow.getType().getTitle() + ";" + task.getName(),
                                                 JobTypeEnum.AFTER, Long.parseLong(i.getUserId()),
-                                                tfFlowLog.getApproveOperation(), processLimitedTime, execField,
+                                                tfFlowLog.getApproveOperation(), processLimitedTime,
+                                                ProcessLimitedEnum.FLOW_TASK_AFTER.getKey(),
                                                 sysUser.getId(), tfCustomFlowEntity.getCrmNo()));
                             }
                         }

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

@@ -29,6 +29,10 @@ public enum ProcessLimitedEnum {
 
     FLOW_TASK("flow_task", "流程待办"),
 
+    FLOW_TASK_BEFORE("flow_task_before", "流程待办提前预警"),
+
+    FLOW_TASK_AFTER("flow_task_after", "流程待办超时预警"),
+
     SERVICE_SCOPE_RADIO("service_scope_radio", "服务范围"),
 
     CONTACTS("contacts", "联系人"),