modify:增加部门信息

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java

@@ -16,6 +16,11 @@ import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
+import com.netease.mail.yanxuan.change.integration.flow.OrgPosDTO;
+import com.netease.mail.yanxuan.change.integration.flow.UserQueryDTO;
+import com.netease.mail.yanxuan.change.integration.flow.ius.IusRpcService;
+import com.netease.mail.yanxuan.change.integration.flow.ius.rsp.IusUserInfoRsp;
+import com.netease.yanxuan.flowx.sdk.meta.controller.communal.AjaxResponse;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Workbook;
@@ -147,6 +152,9 @@ public class ChangeFlowBiz {
     private IusService iusService;
 
     @Autowired
+    private IusRpcService iusRpcService;
+
+    @Autowired
     private SupplierSendService sendSupplierEmail;
 
     public String createAndSubmit(ChangeFlowCreateReq changeFlowCreateReq) {
@@ -877,6 +885,35 @@ public class ChangeFlowBiz {
         PageVO pageVO = buildPageVo(changeRecordPageInfo.getTotal(), pageSize, page);
         ChangeFlowListVO changeFlowListVO = new ChangeFlowListVO();
         changeFlowListVO.setPageVo(pageVO);
+        try {
+            Set<String> commanderList = list.stream().map(ChangeFlowVO::getChangeCommander).collect(Collectors.toSet());
+            Set<String> creatorList = list.stream().map(ChangeFlowVO::getChangeCreator).collect(Collectors.toSet());
+            commanderList.addAll(creatorList);
+            AjaxResponse<List<IusUserInfoRsp>> userListInfo = iusRpcService.queryUserListInfo(UserQueryDTO.builder().uids(new ArrayList<>(commanderList)).build());
+            List<IusUserInfoRsp> data = userListInfo.getData();
+            list.forEach(i -> {
+                Optional<IusUserInfoRsp> commander = data.stream().filter(u -> u.getUid().equals(i.getChangeCommander())).findAny();
+                Optional<IusUserInfoRsp> creator = data.stream().filter(u -> u.getUid().equals(i.getChangeCreator())).findAny();
+                if (commander.isPresent()) {
+                    Optional<OrgPosDTO> anyOrg = commander.get().getOrgPosList().stream().filter(o -> o.getLevel() == 3).findAny();
+                    String orgName = "无三级部门";
+                    if (anyOrg.isPresent()) {
+                        orgName = anyOrg.get().getOrgPosName();
+                    }
+                    i.setChangeCommander(commander.get().getName() + "(" + orgName + ")");
+                }
+                if (creator.isPresent()) {
+                    Optional<OrgPosDTO> anyOrg = creator.get().getOrgPosList().stream().filter(o -> o.getLevel() == 3).findAny();
+                    String orgName = "无三级部门";
+                    if (anyOrg.isPresent()) {
+                        orgName = anyOrg.get().getOrgPosName();
+                    }
+                    i.setChangeCommander(commander.get().getName() + "(" + orgName + ")");
+                }
+            });
+        } catch (Exception ex) {
+            log.error("add org has ex", ex);
+        }
         changeFlowListVO.setChangeFlowList(list);
         return changeFlowListVO;
     }

yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/flow/OrgPosDTO.java

+package com.netease.mail.yanxuan.change.integration.flow;
+
+import lombok.Data;
+
+@Data
+public class OrgPosDTO {
+
+    /**
+     *部门id
+     */
+    private Long orgPosId;
+
+    /**
+     *部门名称
+     */
+    private String orgPosName;
+
+    /**
+     *上一级部门id
+     */
+    private Long parentOrgPosId;
+
+    /**
+     *部门结构类型 0：职能部门，1：项目部门
+     */
+    private Integer posStructType;
+
+    /**
+     *部门的级别
+     */
+    private Integer level;
+
+    /**
+     * 对应oa
+     */
+    private String deptId;
+}

yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/flow/UserQueryDTO.java

+package com.netease.mail.yanxuan.change.integration.flow;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class UserQueryDTO {
+
+    /**
+     * 邮箱集合
+     */
+    private List<String> uids;
+
+    /**
+     * 用户邮箱类型 0 严选员工，1 非严选员工
+     */
+    private Integer userType = 0;
+}

yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/flow/ius/IusRpcService.java

 package com.netease.mail.yanxuan.change.integration.flow.ius;
 
+import com.netease.mail.yanxuan.change.integration.flow.UserQueryDTO;
 import com.netease.mail.yanxuan.change.integration.flow.ius.req.IusDepartmentReq;
 import com.netease.mail.yanxuan.change.integration.flow.ius.rsp.IusUserInfoRsp;
 import com.netease.mail.yanxuan.change.integration.flow.ius.rsp.OrgPosLeaderChainRsp;
@@ -32,6 +33,14 @@ public interface IusRpcService {
     AjaxResponse<IusUserInfoRsp> queryUserInfo(@RequestParam(name = "uid")String uid);
 
     /**
+     * 获取指定用户信息，是否返回操作记录、关联的角色信息。当uid和userId都传时，需保证指向同一个用户。
+     * @param query
+     * @return
+     */
+    @GetMapping("/v1/qc/user/query")
+    AjaxResponse<List<IusUserInfoRsp>> queryUserListInfo(@RequestBody UserQueryDTO query);
+
+    /**
      * 查询指定用户部门下的上级部门(含本部门)负责人链(支持一级或多级)
      * @param uid
      * @return

yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/flow/ius/rsp/IusUserInfoRsp.java

 package com.netease.mail.yanxuan.change.integration.flow.ius.rsp;
 
+import com.netease.mail.yanxuan.change.integration.flow.OrgPosDTO;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author WangJiaXiang
  * @date 2022/11/25/025$
@@ -33,4 +37,9 @@ public class IusUserInfoRsp {
     private String userId;
 
     private String virtual;
+
+    /**
+     * 部门信息列表
+     */
+    private List<OrgPosDTO> orgPosList = new ArrayList<>();
 }