Commit 059d4dad by “zcwang”

modify: 同舟端发起变更在执行节点展示商品详情

parent bb7d5f3d
Pipeline #44457 passed with stages
in 1 minute 24 seconds
...@@ -1002,7 +1002,7 @@ public class ChangeFlowBiz { ...@@ -1002,7 +1002,7 @@ public class ChangeFlowBiz {
if (StringUtils.isNotBlank(itemJsonStr)) { if (StringUtils.isNotBlank(itemJsonStr)) {
List<ItemVO> itemList = JSON.parseArray(itemJsonStr, ItemVO.class); List<ItemVO> itemList = JSON.parseArray(itemJsonStr, ItemVO.class);
changeFlowVO.setChangeItems(itemList); changeFlowVO.setChangeItems(itemList);
// 变更结果确认节点,展示变更商品基础信息 // 变更执行/结果确认/完结节点,展示变更商品基础信息
String flowNode = changeRecord.getFlowNode(); String flowNode = changeRecord.getFlowNode();
if (ChangeFlowEnum.CHANGE_FLOW_EXE.getNodeId().equals(flowNode) if (ChangeFlowEnum.CHANGE_FLOW_EXE.getNodeId().equals(flowNode)
|| ChangeFlowEnum.CHANGE_FLOW_CONFIRM.getNodeId().equals(flowNode) || ChangeFlowEnum.CHANGE_FLOW_CONFIRM.getNodeId().equals(flowNode)
...@@ -1072,7 +1072,9 @@ public class ChangeFlowBiz { ...@@ -1072,7 +1072,9 @@ public class ChangeFlowBiz {
changeFlowVO.setItemBasicInfoList(null); changeFlowVO.setItemBasicInfoList(null);
} }
changeFlowVO.setChangeState(changeRecord.getState()); 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()); List<ChangeFlowExecVO> changeFlowExecRecord = changeFlowExecService.getChangeFlowExecRecord(changeRecord.getId());
try { try {
Set<String> userEmail = changeFlowExecRecord.stream().map(ChangeFlowExecVO::getChangeExecUserEmail).collect(Collectors.toSet()); Set<String> userEmail = changeFlowExecRecord.stream().map(ChangeFlowExecVO::getChangeExecUserEmail).collect(Collectors.toSet());
......
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