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
3cc96765
Commit
3cc96765
authored
Dec 16, 2025
by
王志超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 终止变更无需填写取消原因
parent
18d27000
Pipeline
#86944
passed with stages
in 1 minute 35 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
ChangeFlowBiz.java
...om/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java
+5
-0
ChangeFlowCancelReq.java
...anxuan/change/dal/meta/model/req/ChangeFlowCancelReq.java
+0
-2
No files found.
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java
View file @
3cc96765
...
@@ -841,6 +841,11 @@ public class ChangeFlowBiz {
...
@@ -841,6 +841,11 @@ public class ChangeFlowBiz {
String
operationType
=
req
.
getType
();
String
operationType
=
req
.
getType
();
boolean
isTermination
=
"TERMINATION"
.
equalsIgnoreCase
(
operationType
);
boolean
isTermination
=
"TERMINATION"
.
equalsIgnoreCase
(
operationType
);
// 取消必须填写原因,终止可以不填
if
(!
isTermination
&&
StringUtils
.
isBlank
(
req
.
getCancelReason
()))
{
throw
ExceptionFactory
.
createBiz
(
ResponseCode
.
BAD_REQUEST
,
"取消原因不能为空"
);
}
// 取消和终止都需要检查:节点不是9999(结束节点)且状态不是完结
// 取消和终止都需要检查:节点不是9999(结束节点)且状态不是完结
Integer
currentState
=
changeRecord
.
getState
();
Integer
currentState
=
changeRecord
.
getState
();
if
(
ChangeFlowEnum
.
NEW_END
.
getNodeId
().
equals
(
currentNodeId
)
if
(
ChangeFlowEnum
.
NEW_END
.
getNodeId
().
equals
(
currentNodeId
)
...
...
yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/req/ChangeFlowCancelReq.java
View file @
3cc96765
...
@@ -6,7 +6,6 @@
...
@@ -6,7 +6,6 @@
*/
*/
package
com
.
netease
.
mail
.
yanxuan
.
change
.
dal
.
meta
.
model
.
req
;
package
com
.
netease
.
mail
.
yanxuan
.
change
.
dal
.
meta
.
model
.
req
;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.NotNull
;
import
javax.validation.constraints.NotNull
;
import
javax.validation.constraints.Size
;
import
javax.validation.constraints.Size
;
...
@@ -25,7 +24,6 @@ public class ChangeFlowCancelReq {
...
@@ -25,7 +24,6 @@ public class ChangeFlowCancelReq {
@NotNull
(
message
=
"工单id不能为空"
)
@NotNull
(
message
=
"工单id不能为空"
)
private
Long
flowId
;
private
Long
flowId
;
@NotBlank
(
message
=
"取消原因不能为空"
)
@Size
(
max
=
200
,
message
=
"取消原因限制200字"
)
@Size
(
max
=
200
,
message
=
"取消原因限制200字"
)
private
String
cancelReason
;
private
String
cancelReason
;
...
...
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