Merge branch 'dev_1.1.1' into dev_1.1.2

merge

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

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