Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yanxuan-qc-change-system
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
yx-qc-change-flow
yanxuan-qc-change-system
Commits
599ecca7
Commit
599ecca7
authored
Dec 16, 2025
by
王志超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 终止变更无需填写取消原因
parent
78799462
Pipeline
#86997
passed with stages
in 1 minute 34 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
ChangeFlowBiz.java
...om/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java
+4
-3
No files found.
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java
View file @
599ecca7
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment