Commit 599ecca7 by 王志超

feat: 终止变更无需填写取消原因

parent 78799462
Pipeline #86997 passed with stages
in 1 minute 34 seconds
...@@ -891,7 +891,8 @@ public class ChangeFlowBiz { ...@@ -891,7 +891,8 @@ public class ChangeFlowBiz {
// 填充更新数据 // 填充更新数据
changeRecord.setFlowNode(nextNodeId); changeRecord.setFlowNode(nextNodeId);
changeRecord.setState(ChangeStatusEnum.CANCELLED.getStatus()); changeRecord.setState(ChangeStatusEnum.CANCELLED.getStatus());
changeRecord.setCancelReason(req.getCancelReason()); String cancelReason = isTermination ? "变更工单终止变更" : req.getCancelReason();
changeRecord.setCancelReason(cancelReason);
changeRecord.setUpdateTime(DateUtils.getCurrentTime()); changeRecord.setUpdateTime(DateUtils.getCurrentTime());
// 取消所有行动工单,并获取所有子工单列表(用于后续获取行动人邮箱) // 取消所有行动工单,并获取所有子工单列表(用于后续获取行动人邮箱)
...@@ -993,10 +994,10 @@ public class ChangeFlowBiz { ...@@ -993,10 +994,10 @@ public class ChangeFlowBiz {
// 判断主单是取消还是终止:有 cancelReason 是取消,没有是终止 // 判断主单是取消还是终止:有 cancelReason 是取消,没有是终止
if (StringUtils.isNotBlank(cancelReason)) { if (StringUtils.isNotBlank(cancelReason)) {
// 主工单取消:显示"变更工单取消:取消原因" // 主工单取消:显示"变更工单取消:取消原因"
subFlowRecord.setCancelReason("主工单取消:" + cancelReason); subFlowRecord.setCancelReason("变更工单取消变更:" + cancelReason);
} else { } else {
// 主工单终止 // 主工单终止
subFlowRecord.setCancelReason(""); subFlowRecord.setCancelReason("变更工单终止变更");
} }
subFlowRecord.setUpdateTime(DateUtils.getCurrentTime()); subFlowRecord.setUpdateTime(DateUtils.getCurrentTime());
changeSubFlowRecordService.update(subFlowRecord); changeSubFlowRecordService.update(subFlowRecord);
......
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