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
胡园园
yanxuan-qc-change-system
Commits
3b58f52b
Commit
3b58f52b
authored
Jan 04, 2023
by
“zcwang”
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modify: 变更确认取消更新行动项时间
parent
555add59
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
0 deletions
+10
-0
ChangeFlowBiz.java
...om/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java
+10
-0
No files found.
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java
View file @
3b58f52b
...
...
@@ -751,6 +751,15 @@ public class ChangeFlowBiz {
String
cancelReason
=
changeFlowSubmitReq
.
getCancelReason
();
Assert
.
isTrue
(
StringUtils
.
isNotBlank
(
cancelReason
),
"变更取消原因不可为空"
);
changeRecord
.
setCancelReason
(
cancelReason
);
List
<
ChangeExecRecord
>
cancelChangeExecRecordList
=
execProjectList
.
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
());
String
cancelNode
=
flowService
.
submitFlow
(
flowId
.
toString
(),
flowDataDTO
,
uid
,
ChangeFlowEnum
.
CHANGE_FLOW_CONFIRM
.
getTopoId
(),
JSON
.
toJSONString
(
content
),
true
,
FlowxOperationEnum
.
SUBMIT
.
getName
(),
"提交工单"
,
changeRecord
.
getCreateTime
());
...
...
@@ -758,6 +767,7 @@ public class ChangeFlowBiz {
changeRecord
.
setFlowNode
(
cancelNode
);
changeRecord
.
setUpdateTime
(
DateUtils
.
getCurrentTime
());
changeFlowService
.
updateRecord
(
changeRecord
);
cancelChangeExecRecordList
.
forEach
(
exec
->
changeFlowExecService
.
update
(
exec
));
// 发送邮件
HashMap
<
String
,
Object
>
cancelMap
=
new
HashMap
<>();
cancelMap
.
put
(
"changeId"
,
changeRecord
.
getFlowId
());
...
...
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