Commit f370aef1 by “zcwang”

modify:延期只校验延期时间

parent 813e3c2c
......@@ -570,7 +570,7 @@ public class ChangeFlowBiz {
changeFlowService.updateRecord(changeRecord);
// 更新行动执行方案,覆盖操作,先删除,后插入
Integer changeExecCount = changeFlowExecService.deleteByChangeRecordId(changeRecord.getId());
log.info("[CHANGE_FLOW_SUBMIT] delete changeExecCount:{}", changeExecCount);
log.info("[CHANGE_FLOW_SUBMIT] delete id:{}, changeExecCount:{}", changeRecord.getId(), changeExecCount);
// 保存变更行动方案记录
List<ChangeExecRecord> changeExecRecords = buildChangeExecRecord(changeRecord.getId(),
changeFlowSubmitReq.getChangeExecProjectList());
......@@ -758,26 +758,16 @@ public class ChangeFlowBiz {
return cancelNode;
case DELAY:
// 延期不流转工单
long changeConfirmResultTime = changeFlowSubmitReq.getChangeConfirmResultTime();
Long changeConfirmResultTime = changeFlowSubmitReq.getChangeConfirmResultTime();
Long tomorrowSpecificTime = DateUtils.getTomorrowSpecificTime("09:00:00");
Assert.isTrue(changeConfirmResultTime >= tomorrowSpecificTime, "时间不可晚于下次执行时间");
List<ChangeExecConfigReq> execProjectList1 = changeFlowSubmitReq.getChangeExecProjectList();
List<ChangeExecRecord> changeExecRecords1 = execProjectList1.stream().map(exec -> {
Long changeExecFinishTime = exec.getChangeExecFinishTime();
Assert.notNull(changeExecFinishTime, "行动完成时间不可为空" + exec.getChangeTemplateId());
ChangeExecRecord changeExecRecord = new ChangeExecRecord();
changeExecRecord.setId(exec.getChangeExecId());
changeExecRecord.setChangeExecFinishTime(exec.getChangeExecFinishTime());
changeExecRecord.setChangeExecFinishDesc(exec.getChangeExecFinishDesc());
return changeExecRecord;
}).collect(Collectors.toList());
Assert.isTrue(
changeConfirmResultTime != null && changeConfirmResultTime >= tomorrowSpecificTime,
"时间不可晚于下次执行时间");
changeRecord.setState(ChangeStatusEnum.DELAY.getStatus());
// 更改变更结果确认时间
changeRecord.setChangeConfirmResultTime(changeConfirmResultTime);
changeRecord.setUpdateTime(DateUtils.getCurrentTime());
changeFlowService.updateRecord(changeRecord);
changeExecRecords1.forEach(exec -> changeFlowExecService.update(exec));
// 变更行动项
return null;
default:
return null;
......
......@@ -92,7 +92,7 @@ public class ChangeFlowSubmitReq {
/**
* 变更结果确认时间,时间戳
*/
private long changeConfirmResultTime;
private Long changeConfirmResultTime;
/**
* 变更行动项
*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment