|
@@ -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();
|