wangliang 9 달 전
부모
커밋
6a95a1d05a
1개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 4 4
      sop-business/src/main/java/com/qmth/sop/business/service/impl/TBSopInfoServiceImpl.java

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

@@ -1369,28 +1369,28 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
                     tsJobRemindService.updateJobRemind(Long.parseLong(task.getId()));
                 }
                 FlowTaskResult flowTaskResult = this.getFormProperties(tfCustomFlowEntity, 1);
-                if (tfFlowApprove.getSetup().intValue() == 2) {//扫描准备流程
+                if (tfFlowApprove.getSetup().intValue() >= 1 && tfFlowApprove.getSetup().intValue() <= 2) {//扫描准备流程
                     processLimitedTime = this.getProcessLimitedTime(flowTaskResult,
                             ProcessLimitedEnum.SCAN_START_TIME.getKey());
                     execField = ProcessLimitedEnum.SCAN_START_TIME.getKey();
                     createJobRemind(execField, processLimitedTime, taskList, tfCustomFlowEntity, tfCustomFlow,
                             tfFlowLog, sysUser.getId(), "扫描准备");
                 }
-                if (tfFlowApprove.getSetup().intValue() >= 2 && tfFlowApprove.getSetup().intValue() <= 3) {//扫描收尾检查
+                if (tfFlowApprove.getSetup().intValue() >= 1 && tfFlowApprove.getSetup().intValue() <= 3) {//扫描收尾检查
                     processLimitedTime = this.getProcessLimitedTime(flowTaskResult,
                             ProcessLimitedEnum.SCAN_END_TIME.getKey());
                     execField = ProcessLimitedEnum.SCAN_END_TIME.getKey();
                     createJobRemind(execField, processLimitedTime, taskList, tfCustomFlowEntity, tfCustomFlow,
                             tfFlowLog, sysUser.getId(), "扫描收尾");
                 }
-                if (tfFlowApprove.getSetup().intValue() >= 2 && tfFlowApprove.getSetup().intValue() <= 4) {//阅卷参数检查
+                if (tfFlowApprove.getSetup().intValue() >= 1 && tfFlowApprove.getSetup().intValue() <= 4) {//阅卷参数检查
                     processLimitedTime = this.getProcessLimitedTime(flowTaskResult,
                             ProcessLimitedEnum.MARK_START_TIME.getKey());
                     execField = ProcessLimitedEnum.MARK_START_TIME.getKey();
                     createJobRemind(execField, processLimitedTime, taskList, tfCustomFlowEntity, tfCustomFlow,
                             tfFlowLog, sysUser.getId(), "阅卷参数检查");
                 }
-                if (tfFlowApprove.getSetup().intValue() >= 2 && tfFlowApprove.getSetup().intValue() <= 5) {//阅卷收尾检查
+                if (tfFlowApprove.getSetup().intValue() >= 1 && tfFlowApprove.getSetup().intValue() <= 5) {//阅卷收尾检查
                     processLimitedTime = this.getProcessLimitedTime(flowTaskResult,
                             ProcessLimitedEnum.MARK_END_TIME.getKey());
                     execField = ProcessLimitedEnum.MARK_END_TIME.getKey();