merge:feature-ModifyQueryUser-230110:operator:hzhuyuanyuan@corp.netease.com:auto…

merge:feature-ModifyQueryUser-230110:operator:hzhuyuanyuan@corp.netease.com:auto_branch_merge_by_branchService_end

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

@@ -1082,6 +1082,12 @@ public class ChangeFlowBiz {
                 Optional<IusUserInfoRsp> anyExeUser = data.stream().filter(u -> u.getUid().equals(i.getChangeExecUserEmail())).findAny();
                 if (anyExeUser.isPresent()) {
                     i.setChangeExecUserName(anyExeUser.get().getName());
+                } else {
+                    // 批量查询没查到的人名，通过全量查询单独再查一次
+                    IusUserInfoRsp user = iusService.queryUserInfo(i.getChangeExecUserEmail());
+                    if (user != null && StringUtils.isNotBlank(user.getName())) {
+                        i.setChangeExecUserName(user.getName());
+                    }
                 }
             });
 
@@ -1100,6 +1106,7 @@ public class ChangeFlowBiz {
             commanderList.add(changeRecord.getCreator());
             IusDepartmentReq iusDepartmentReq = new IusDepartmentReq();
             iusDepartmentReq.setUids(new ArrayList<>(commanderList));
+            iusDepartmentReq.setIcac(true);
             HashMap<String, List<SecondaryDepartments>> orgMap = iusService.queryDepartment(iusDepartmentReq);
             List<SecondaryDepartments> commander = orgMap.get(changeRecord.getChangeCommander());
             List<SecondaryDepartments> creator = orgMap.get(changeRecord.getCreator());
@@ -1184,6 +1191,7 @@ public class ChangeFlowBiz {
             commanderList.addAll(creatorList);
             IusDepartmentReq iusDepartmentReq = new IusDepartmentReq();
             iusDepartmentReq.setUids(new ArrayList<>(commanderList));
+            iusDepartmentReq.setIcac(true);
             HashMap<String, List<SecondaryDepartments>> orgMap = iusService.queryDepartment(iusDepartmentReq);
             //AjaxResponse<List<IusUserInfoRsp>> userListInfo = iusRpcService.queryUserListInfo(UserQueryDTO.builder().uids(new ArrayList<>(commanderList)).build());
             log.debug("query user: {} info: {}", commanderList, JSON.toJSONString(orgMap));
@@ -1201,6 +1209,7 @@ public class ChangeFlowBiz {
                     }
                     i.setChangeCommander(commander.get(0).getUserName() + "(" + orgName + ")");
                 }
+                // 供应商查询不到数据，不会覆盖，展示供应商id
                 if (!CollectionUtils.isEmpty(creator)) {
                     Optional<SecondaryDepartments> anyOrg = creator.stream().filter(o -> o.getOrgPosLevel() == 97).findAny();
                     String orgName = "无三级部门";

yanxuan-qc-change-system-common/src/main/java/com/netease/mail/yanxuan/change/common/enums/ChangeLevelEnum.java

@@ -5,26 +5,33 @@ package com.netease.mail.yanxuan.change.common.enums;
  * @date 2022/11/16/016$
  */
 public enum ChangeLevelEnum {
-
-    PRINCIPAL(1,"重要变更"),
-
-    ORDINARY(2,"一般变更");
+    IMPORTANT(1,"重要变更"),
+    COMMONLY(2,"一般变更");
 
 
     private Integer type;
 
     private String desc;
 
-    ChangeLevelEnum(Integer status, String desc) {
-        this.type = status;
+    ChangeLevelEnum(Integer type, String desc) {
+        this.type = type;
         this.desc = desc;
     }
 
-    public Integer getStatus() {
+    public Integer getType() {
         return type;
     }
 
     public String getDesc() {
         return desc;
     }
+
+    public static String getByType(Integer type) {
+        for (ChangeLevelEnum value : ChangeLevelEnum.values()) {
+            if (value.getType().equals(type)) {
+                return value.getDesc();
+            }
+        }
+        return null;
+    }
 }

yanxuan-qc-change-system-common/src/main/java/com/netease/mail/yanxuan/change/common/enums/MainSpuStatusEnum.java

@@ -12,9 +12,9 @@ package com.netease.mail.yanxuan.change.common.enums;
  */
 public enum MainSpuStatusEnum {
     INIT(0,"未上架"),
-    NOT_ON_SHELVES(3,"未上架"),
-    ON_SHELVES(4,"已上架"),
-    PRESHELVING(5,"预上架");
+    NOT_ON_SHELVES(1,"未上架"),
+    ON_SHELVES(2,"已上架"),
+    PRESHELVING(4,"预上架");
 
     private Integer status;
 

yanxuan-qc-change-system-common/src/main/java/com/netease/mail/yanxuan/change/common/enums/ProfitTypeEnum.java

@@ -13,7 +13,7 @@ package com.netease.mail.yanxuan.change.common.enums;
 public enum ProfitTypeEnum {
     RISK_CONTROL(1, "风险控制类"),
     REDUCE_COST(2, "降本类"),
-    PRODUCT_IMPROVE(3, "商品改善"),
+    PRODUCT_IMPROVE(3, "商品改善类"),
     REPLACE_CERTIFICATES_WHEN_EXPIRE(4, "证件到期更换"),
     OTHER(5, "其他"),
     NO(6, "无");

yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/excel/ChangeFlowExcelDTO.java

@@ -52,7 +52,7 @@ public class ChangeFlowExcelDTO {
      * 变更等级
      */
     @Excel(name = "变更等级")
-    private Integer changeLevel;
+    private String changeLevel;
 
     /**
      * 变更负责部门名

yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/excel/ChangeFlowExcelVo.java

@@ -62,7 +62,7 @@ public class ChangeFlowExcelVo {
     /**
      * 变更负责部门名
      */
-    @ExcelTitleName(title = "变更负责部门名", order = 7)
+    @ExcelTitleName(title = "变更负责部门", order = 7)
     private String changeDepartment;
 
     /**
@@ -185,7 +185,7 @@ public class ChangeFlowExcelVo {
     /**
      * 行动项变更风险描述
      */
-    @ExcelTitleName(title = "行动项变更风险描述", order = 28)
+    @ExcelTitleName(title = "变更风险描述", order = 28)
     private String changeExecRiskDesc;
 
     /**

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

@@ -46,8 +46,8 @@ public interface IusRpcService {
      * @param uid
      * @return
      */
-    @GetMapping("/v1/qc/allTeam/pos/queryLeaderChain")
-    AjaxResponse<List<OrgPosLeaderChainRsp>> queryLeaderChain(@RequestParam(name = "uid")String uid);
+    /*@GetMapping("/v1/qc/allTeam/pos/queryLeaderChain")
+    AjaxResponse<List<OrgPosLeaderChainRsp>> queryLeaderChain(@RequestParam(name = "uid")String uid);*/
 
     /**
      * 查询用户的负责人链(直接上级和所有上级)，返回(key=用户邮箱，value=用户所属所有部门的上级(包括本部门)负责人链)