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
059d4dad
Commit
059d4dad
authored
Jan 04, 2023
by
“zcwang”
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modify: 同舟端发起变更在执行节点展示商品详情
parent
bb7d5f3d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
ChangeFlowBiz.java
...om/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java
+4
-2
No files found.
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java
View file @
059d4dad
...
...
@@ -1002,7 +1002,7 @@ public class ChangeFlowBiz {
if
(
StringUtils
.
isNotBlank
(
itemJsonStr
))
{
List
<
ItemVO
>
itemList
=
JSON
.
parseArray
(
itemJsonStr
,
ItemVO
.
class
);
changeFlowVO
.
setChangeItems
(
itemList
);
// 变更
结果确认
节点,展示变更商品基础信息
// 变更
执行/结果确认/完结
节点,展示变更商品基础信息
String
flowNode
=
changeRecord
.
getFlowNode
();
if
(
ChangeFlowEnum
.
CHANGE_FLOW_EXE
.
getNodeId
().
equals
(
flowNode
)
||
ChangeFlowEnum
.
CHANGE_FLOW_CONFIRM
.
getNodeId
().
equals
(
flowNode
)
...
...
@@ -1072,7 +1072,9 @@ public class ChangeFlowBiz {
changeFlowVO
.
setItemBasicInfoList
(
null
);
}
changeFlowVO
.
setChangeState
(
changeRecord
.
getState
());
changeFlowVO
.
setChangeCreator
(
changeRecord
.
getCreator
());
changeFlowVO
.
setChangeCreator
(
CreateSourceEnum
.
TONG_ZHOU
.
getType
().
equals
(
changeRecord
.
getCreateSource
())
?
changeRecord
.
getCreateSupplier
()
:
changeRecord
.
getCreator
());
List
<
ChangeFlowExecVO
>
changeFlowExecRecord
=
changeFlowExecService
.
getChangeFlowExecRecord
(
changeRecord
.
getId
());
try
{
Set
<
String
>
userEmail
=
changeFlowExecRecord
.
stream
().
map
(
ChangeFlowExecVO:
:
getChangeExecUserEmail
).
collect
(
Collectors
.
toSet
());
...
...
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