Commit ba34ead7 by 穆龙飞

modify:增加部门信息

parent 40ab686f
Pipeline #43746 passed with stages
in 2 minutes 20 seconds
...@@ -831,6 +831,20 @@ public class ChangeFlowBiz { ...@@ -831,6 +831,20 @@ public class ChangeFlowBiz {
changeFlowVO.setChangeState(changeRecord.getState()); changeFlowVO.setChangeState(changeRecord.getState());
changeFlowVO.setChangeCreator(changeRecord.getCreator()); changeFlowVO.setChangeCreator(changeRecord.getCreator());
List<ChangeFlowExecVO> changeFlowExecRecord = changeFlowExecService.getChangeFlowExecRecord(changeRecord.getId()); List<ChangeFlowExecVO> changeFlowExecRecord = changeFlowExecService.getChangeFlowExecRecord(changeRecord.getId());
try {
Set<String> userEmail = changeFlowExecRecord.stream().map(ChangeFlowExecVO::getChangeExecUserEmail).collect(Collectors.toSet());
AjaxResponse<List<IusUserInfoRsp>> userListInfo = iusRpcService.queryUserListInfo(UserQueryDTO.builder().uids(new ArrayList<>(userEmail)).build());
List<IusUserInfoRsp> data = userListInfo.getData();
changeFlowExecRecord.forEach(i -> {
Optional<IusUserInfoRsp> anyExeUser = data.stream().filter(u -> u.getUid().equals(i.getChangeExecUserEmail())).findAny();
if (anyExeUser.isPresent()) {
i.setChangeExecUserName(anyExeUser.get().getName());
}
});
} catch (Exception ex) {
log.info("query user info has ex", ex);
}
changeFlowVO.setChangeExecProjectList(changeFlowExecRecord); changeFlowVO.setChangeExecProjectList(changeFlowExecRecord);
changeFlowVO.setCreateTime(changeRecord.getCreateTime()); changeFlowVO.setCreateTime(changeRecord.getCreateTime());
changeFlowVO.setChangeConfirmResultTime(changeRecord.getChangeConfirmResultTime()); changeFlowVO.setChangeConfirmResultTime(changeRecord.getChangeConfirmResultTime());
......
...@@ -51,6 +51,11 @@ public class ChangeFlowExecVO { ...@@ -51,6 +51,11 @@ public class ChangeFlowExecVO {
private String changeExecUserEmail; private String changeExecUserEmail;
/** /**
* 用户名
*/
private String changeExecUserName;
/**
* 变更风险描述 * 变更风险描述
*/ */
private String changeRiskDesc; private String changeRiskDesc;
......
...@@ -119,7 +119,7 @@ public class ChangeFlowVO { ...@@ -119,7 +119,7 @@ public class ChangeFlowVO {
*/ */
private String changeCreator; private String changeCreator;
/** /**
* 变更行动部门 * 变更行动方案
*/ */
private List<ChangeFlowExecVO> changeExecProjectList; private List<ChangeFlowExecVO> changeExecProjectList;
......
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