|
@@ -1347,9 +1347,26 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
|
|
|
tbSopInfoService.saveSopPlanDate(flowTaskResult, sopId, tfCustomFlowEntity.getFlowId(), sysUser.getId(),
|
|
|
tfCustomFlow.getType());
|
|
|
} else if (tfCustomFlow.getType() == TFCustomTypeEnum.CLOUD_MARK_SOP_FLOW) {//研究生sop
|
|
|
- FlowTaskResult flowTaskResult = this.getFormProperties(tfCustomFlowEntity, 1);
|
|
|
- tbSopInfoService.saveSopPlanDate(flowTaskResult, sopId, tfCustomFlowEntity.getFlowId(), sysUser.getId(),
|
|
|
- tfCustomFlow.getType());
|
|
|
+ FlowTaskResult flowTaskResult = this.getFormProperties(tfCustomFlowEntity, 2);
|
|
|
+ if (tfFlowApprove.getSetup().intValue() == 5) {//扫描准备流程
|
|
|
+ processLimitedTime = this.getProcessLimitedTime(flowTaskResult,
|
|
|
+ ProcessLimitedEnum.SCAN_START_TIME.getKey());
|
|
|
+ execField = ProcessLimitedEnum.SCAN_START_TIME.getKey();
|
|
|
+ } else if (tfFlowApprove.getSetup().intValue() == 6) {//扫描收尾检查
|
|
|
+ processLimitedTime = this.getProcessLimitedTime(flowTaskResult,
|
|
|
+ ProcessLimitedEnum.SCAN_END_TIME.getKey());
|
|
|
+ execField = ProcessLimitedEnum.SCAN_END_TIME.getKey();
|
|
|
+ } else if (tfFlowApprove.getSetup().intValue() == 7) {//阅卷参数检查
|
|
|
+ processLimitedTime = this.getProcessLimitedTime(flowTaskResult,
|
|
|
+ ProcessLimitedEnum.MARK_START_TIME.getKey());
|
|
|
+ execField = ProcessLimitedEnum.MARK_START_TIME.getKey();
|
|
|
+ } else if (tfFlowApprove.getSetup().intValue() == 9) {//阅卷收尾检查
|
|
|
+ processLimitedTime = this.getProcessLimitedTime(flowTaskResult,
|
|
|
+ ProcessLimitedEnum.MARK_END_TIME.getKey());
|
|
|
+ execField = ProcessLimitedEnum.MARK_END_TIME.getKey();
|
|
|
+ }
|
|
|
+ tbSopInfoService.saveSopPlanDate(this.getFormProperties(tfCustomFlowEntity, 1), sopId,
|
|
|
+ tfCustomFlowEntity.getFlowId(), sysUser.getId(), tfCustomFlow.getType());
|
|
|
}
|
|
|
if (Objects.nonNull(execField)) {
|
|
|
for (Task task : taskList) {
|