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-biz/src/main/java/com/netease/mail/yanxuan/change/biz/callback/ChangeFlowExportCallback.java

@@ -33,10 +33,13 @@ import com.netease.mail.yanxuan.change.biz.service.change.ChangeTypeService;
 import com.netease.mail.yanxuan.change.biz.service.rpc.ItemService;
 import com.netease.mail.yanxuan.change.biz.service.rpc.IusService;
 import com.netease.mail.yanxuan.change.biz.service.rpc.QCService;
+import com.netease.mail.yanxuan.change.biz.service.rpc.SupplierService;
 import com.netease.mail.yanxuan.change.common.enums.BusinessFormEnum;
+import com.netease.mail.yanxuan.change.common.enums.ChangeLevelEnum;
 import com.netease.mail.yanxuan.change.common.enums.ChangeResultEnum;
 import com.netease.mail.yanxuan.change.common.enums.ChangeStatusEnum;
 import com.netease.mail.yanxuan.change.common.enums.ChangeSubjectEnum;
+import com.netease.mail.yanxuan.change.common.enums.CreateSourceEnum;
 import com.netease.mail.yanxuan.change.common.enums.ItemSetupTypeEnum;
 import com.netease.mail.yanxuan.change.common.enums.MainSpuStatusEnum;
 import com.netease.mail.yanxuan.change.common.enums.ProfitTypeEnum;
@@ -53,7 +56,10 @@ import com.netease.mail.yanxuan.change.dal.meta.model.vo.ItemVO;
 import com.netease.mail.yanxuan.change.integration.excel.ChangeFlowExcelDTO;
 import com.netease.mail.yanxuan.change.integration.excel.ChangeFlowExcelVo;
 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.SecondaryDepartments;
+import com.netease.mail.yanxuan.change.integration.flow.supplier.rsp.SupplierSimpleRsp;
 import com.netease.mail.yanxuan.change.integration.item.SimplePhyCateGoryResultCo;
 import com.netease.mail.yanxuan.change.integration.item.meta.SpuTO;
 import com.netease.mail.yanxuan.change.integration.item.param.BatchQuerySpuInfoParam;
@@ -91,6 +97,9 @@ public class ChangeFlowExportCallback implements DesCallbackService {
     @Autowired
     private IusService iusService;
 
+    @Autowired
+    private SupplierService supplierService;
+
     @Override
     public ExcelTitle queryExcelTitle(CallbackQueryReq req) {
         log.info("[op: change flow export callback queryExcelTitle] req={}", JSON.toJSONString(req));
@@ -118,11 +127,31 @@ public class ChangeFlowExportCallback implements DesCallbackService {
         ChangeFlowListQueryReq changeFlowListQueryReq = new ChangeFlowListQueryReq();
         BeanUtils.copyProperties(query, changeFlowListQueryReq);
         List<ChangeRecord> changeRecords = changeRecordMapper.selectByConditionAndLimit(changeFlowListQueryReq);
-        log.debug("[getExportList] changeRecords:{}", changeRecords);
+        log.debug("[getExportList] changeRecords:{}", JSON.toJSONString(changeRecords));
         if (CollectionUtils.isEmpty(changeRecords)) {
             return Lists.newArrayList();
         }
-        // 提前查询所有行动项用户名
+        // 过滤不为供应商的创建人
+        List<String> creatorList = changeRecords.stream()
+            .filter(c -> !CreateSourceEnum.TONG_ZHOU.getType().equals(c.getCreateSource()))
+            .map(ChangeRecord::getCreator).collect(Collectors.toList());
+        List<String> allQueryDepartmentList = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(creatorList)) {
+            allQueryDepartmentList.addAll(creatorList);
+        }
+        List<String> changeCommanderList = changeRecords.stream().map(ChangeRecord::getChangeCommander).collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(changeCommanderList)) {
+            allQueryDepartmentList.addAll(changeCommanderList);
+        }
+        HashMap<String, List<SecondaryDepartments>> orgMap = null;
+        if (CollectionUtils.isNotEmpty(allQueryDepartmentList)) {
+            // 查询创建人部门名
+            IusDepartmentReq iusDepartmentReq = new IusDepartmentReq();
+            iusDepartmentReq.setUids(new ArrayList<>(allQueryDepartmentList));
+            iusDepartmentReq.setIcac(true);
+            orgMap = iusService.queryDepartment(iusDepartmentReq);
+        }
+        // 提前查询所有创建人及行动项用户名
         List<String> allExecUserEmailList = new ArrayList<>();
         for (ChangeRecord changeRecord : changeRecords) {
             List<ChangeExecRecord> changeExecRecords = changeExecRecordMapper.selectByChangeRecordId(changeRecord.getId());
@@ -184,7 +213,7 @@ public class ChangeFlowExportCallback implements DesCallbackService {
                         for (ChangeExecRecord changeExecRecord : changeExecRecords) {
                             Long itemId = itemVO.getItemId();
                             // 组装通用信息，除商品信息，行动项以外其他字段一致
-                            ChangeFlowExcelDTO changeFlowExcelDTO = this.obtainCommon(record, changeSubjectEnum);
+                            ChangeFlowExcelDTO changeFlowExcelDTO = this.obtainCommon(record, changeSubjectEnum, orgMap);
                             changeFlowExcelDTO.setSupplier("/");
                             changeFlowExcelDTO.setChangeItem(itemVO.getItemName());
                             changeFlowExcelDTO.setSPUId(itemId);
@@ -235,12 +264,7 @@ public class ChangeFlowExportCallback implements DesCallbackService {
                             }
                             // 组装行动项相关信息
                             obtainChangeExec(changeExecRecord, changeFlowExcelDTO, userListInfo);
-                            ChangeResultEnum resultEnum = ChangeResultEnum.getByStatus(record.getChangeResult());
-                            changeFlowExcelDTO.setChangeResult(resultEnum == null ? "": resultEnum.getDesc());
-                            changeFlowExcelDTO
-                                .setChangeEndTime(record.getState().equals(ChangeStatusEnum.END.getStatus())
-                                    ? DateUtils.parseLongToString(record.getUpdateTime(), DateUtils.DATE_TIME_FORMAT)
-                                    : "");
+                            this.obtainOther(record, changeFlowExcelDTO);
                             changeFlowExcelDTOList.add(changeFlowExcelDTO);
                         }
                     }
@@ -251,8 +275,18 @@ public class ChangeFlowExportCallback implements DesCallbackService {
                     // 供应商变更，以行动项循环
                     for (ChangeExecRecord changeExecRecord : changeExecRecords) {
                         // 组装通用信息，除商品信息，行动项以外其他字段一致
-                        ChangeFlowExcelDTO changeFlowExcelDTO = this.obtainCommon(record, changeSubjectEnum);
-                        changeFlowExcelDTO.setSupplier(StringUtils.isBlank(record.getChangeSupplier())? "/": record.getChangeSupplier());
+                        ChangeFlowExcelDTO changeFlowExcelDTO = this.obtainCommon(record, changeSubjectEnum, orgMap);
+                        String changeSupplier = StringUtils.isBlank(record.getChangeSupplier()) ? "" : record.getChangeSupplier();
+                        String changeSupplierName = "";
+                        if (StringUtils.isNotBlank(changeSupplier)) {
+                            List<SupplierSimpleRsp> supplierSimple = supplierService.getSupplierName(changeSupplier);
+                            if (CollectionUtils.isNotEmpty(supplierSimple)) {
+                                SupplierSimpleRsp supplier = supplierSimple.get(0);
+                                changeSupplierName = supplier.getSupplierName();
+                            }
+                        }
+                        changeFlowExcelDTO.setSupplier(
+                            StringUtils.isBlank(changeSupplier) ? "/" : changeSupplier + changeSupplierName);
                         changeFlowExcelDTO.setChangeItem(null);
                         changeFlowExcelDTO.setSPUId(null);
                         changeFlowExcelDTO.setQcCategory(null);
@@ -266,12 +300,7 @@ public class ChangeFlowExportCallback implements DesCallbackService {
                         changeFlowExcelDTO.setGoodsProject(null);
                         // 组装行动项相关信息
                         this.obtainChangeExec(changeExecRecord, changeFlowExcelDTO, userListInfo);
-                        ChangeResultEnum resultEnum = ChangeResultEnum.getByStatus(record.getChangeResult());
-                        changeFlowExcelDTO.setChangeResult(resultEnum == null ? "": resultEnum.getDesc());
-                        changeFlowExcelDTO
-                                .setChangeEndTime(record.getState().equals(ChangeStatusEnum.END.getStatus())
-                                        ? DateUtils.parseLongToString(record.getUpdateTime(), DateUtils.DATE_TIME_FORMAT)
-                                        : "/");
+                        this.obtainOther(record, changeFlowExcelDTO);
                         changeFlowExcelDTOList.add(changeFlowExcelDTO);
                     }
                     break;
@@ -282,6 +311,18 @@ public class ChangeFlowExportCallback implements DesCallbackService {
 
     }
 
+    private void obtainOther(ChangeRecord record, ChangeFlowExcelDTO changeFlowExcelDTO) {
+        ChangeResultEnum resultEnum = ChangeResultEnum.getByStatus(record.getChangeResult());
+        log.debug("[obtainOther] record:{}, resultEnum:{}", JSON.toJSONString(record), resultEnum);
+        changeFlowExcelDTO.setChangeResult(resultEnum == null ? "/" : resultEnum.getDesc());
+        if (record.getState().equals(ChangeStatusEnum.CANCEL.getStatus())
+                || record.getState().equals(ChangeStatusEnum.END.getStatus())) {
+            changeFlowExcelDTO.setChangeEndTime(DateUtils.parseLongToString(record.getUpdateTime(), DateUtils.DATE_TIME_FORMAT));
+        } else {
+            changeFlowExcelDTO.setChangeEndTime("/");
+        }
+    }
+
     private void buildGoodsPrincipal(ChangeGoodsPrincipalPO changeGoodsPrincipalPO, ChangeFlowExcelDTO changeFlowExcelDTO) {
         String functionaryName = StringUtils.isBlank(changeGoodsPrincipalPO.getFunctionaryName()) ? "" : changeGoodsPrincipalPO.getFunctionaryName();
         String functionaryEmail = StringUtils.isBlank(changeGoodsPrincipalPO.getFunctionaryEmail()) ? "" : changeGoodsPrincipalPO.getFunctionaryEmail();
@@ -307,14 +348,19 @@ public class ChangeFlowExportCallback implements DesCallbackService {
         changeFlowExcelDTO.setExecDepartment(changeExecRecord.getChangeExecDepartment());
         Optional<IusUserInfoRsp> anyExeUser = userListInfo.stream()
             .filter(u -> u.getUid().equals(changeExecRecord.getChangeExecUserEmail())).findAny();
-        String execUserName = "";
+        String execUserName;
         if (anyExeUser.isPresent()) {
             execUserName = anyExeUser.get().getName();
+        } else {
+            // 批量查询没查到的人名，通过全量查询单独再查一次
+            IusUserInfoRsp user = iusService.queryUserInfo(changeExecRecord.getChangeExecUserEmail());
+            execUserName = user == null || StringUtils.isBlank(user.getName()) ? "" : user.getName();
         }
         changeFlowExcelDTO.setChangeExecUser(execUserName + changeExecRecord.getChangeExecUserEmail());
         changeFlowExcelDTO.setChangeExecRiskDesc(changeExecRecord.getChangeRiskDesc());
         changeFlowExcelDTO.setChangeExecProject(changeExecRecord.getChangeExecProject());
-        changeFlowExcelDTO.setChangeChecking(changeExecRecord.getChangeChecking());
+        changeFlowExcelDTO.setChangeChecking(
+            StringUtils.isBlank(changeExecRecord.getChangeChecking()) ? "/" : changeExecRecord.getChangeChecking());
         Long changeExecFinishTime = changeExecRecord.getChangeExecFinishTime();
         if (changeExecFinishTime == 0L) {
             changeFlowExcelDTO.setChangeExecFinishTime("/");
@@ -322,7 +368,8 @@ public class ChangeFlowExportCallback implements DesCallbackService {
             changeFlowExcelDTO.setChangeExecFinishTime(
                     DateUtils.parseLongToString(changeExecFinishTime, DateUtils.DATE_TIME_FORMAT));
         }
-        changeFlowExcelDTO.setChangeExecFinishDesc(changeExecRecord.getChangeExecFinishDesc());
+        changeFlowExcelDTO.setChangeExecFinishDesc(StringUtils.isBlank(changeExecRecord.getChangeExecFinishDesc()) ? "/"
+            : changeExecRecord.getChangeExecFinishDesc());
     }
 
     /**
@@ -331,23 +378,44 @@ public class ChangeFlowExportCallback implements DesCallbackService {
      * @param changeSubjectEnum
      * @return
      */
-    private ChangeFlowExcelDTO obtainCommon(ChangeRecord record, ChangeSubjectEnum changeSubjectEnum) {
+    private ChangeFlowExcelDTO obtainCommon(ChangeRecord record, ChangeSubjectEnum changeSubjectEnum, HashMap<String, List<SecondaryDepartments>> orgMap) {
         ChangeFlowExcelDTO changeFlowExcelDTO = new ChangeFlowExcelDTO();
         changeFlowExcelDTO.setFlowId(record.getFlowId());
         String createTimeStr = DateUtils.parseLongToString(record.getCreateTime(), DateUtils.DATE_TIME_FORMAT);
         changeFlowExcelDTO.setCreateTime(createTimeStr);
-        changeFlowExcelDTO.setChangeCreator(record.getCreator());
+        // 供应商发起，展示供应商id，否则展示：用户名(部门名)
+        if (CreateSourceEnum.TONG_ZHOU.getType().equals(record.getCreateSource())) {
+            changeFlowExcelDTO.setChangeCreator(record.getCreateSupplier());
+        } else {
+            List<SecondaryDepartments> creator = orgMap.get(record.getCreator());
+            if (!CollectionUtils.isEmpty(creator)) {
+                Optional<SecondaryDepartments> anyOrg = creator.stream().filter(o -> o.getOrgPosLevel() == 97).findAny();
+                String orgName = "无三级部门";
+                if (anyOrg.isPresent()) {
+                    orgName = anyOrg.get().getOrgPosName();
+                }
+                changeFlowExcelDTO.setChangeCreator(creator.get(0).getUserName() + "(" + orgName + ")");
+            }
+        }
         changeFlowExcelDTO.setChangeSubject(changeSubjectEnum.getDesc());
         ChangeType parentChangeType = changeTypeService.getChangeTypeById(record.getParentChangeClassId());
         ChangeType sonChangeType = changeTypeService.getChangeTypeById(record.getSonChangeClassId());
         changeFlowExcelDTO.setChangeType(parentChangeType.getTypeName() + ">" + sonChangeType.getTypeName());
-        changeFlowExcelDTO.setChangeLevel(record.getChangeLevel());
+        changeFlowExcelDTO.setChangeLevel(ChangeLevelEnum.getByType(record.getChangeLevel()));
         changeFlowExcelDTO.setChangeDepartment(record.getChangeDepartment());
-        changeFlowExcelDTO.setChangeCommander(record.getChangeCommander());
+        List<SecondaryDepartments> commander = orgMap.get(record.getChangeCommander());
+        if (!CollectionUtils.isEmpty(commander)) {
+            Optional<SecondaryDepartments> anyOrg = commander.stream().filter(o -> o.getOrgPosLevel() == 97).findAny();
+            String orgName = "无三级部门";
+            if (anyOrg.isPresent()) {
+                orgName = anyOrg.get().getOrgPosName();
+            }
+            changeFlowExcelDTO.setChangeCommander(commander.get(0).getUserName() + "(" + orgName + ")");
+        }
         changeFlowExcelDTO.setChangeReason(record.getChangeReason());
         changeFlowExcelDTO.setChangeContent(record.getChangeContent());
-        changeFlowExcelDTO.setChangeRiskDesc(record.getChangeRiskDesc());
-        // todo:变更收益类型和前端核对枚举
+        changeFlowExcelDTO
+            .setChangeRiskDesc(StringUtils.isBlank(record.getChangeRiskDesc()) ? "/" : record.getChangeRiskDesc());
         changeFlowExcelDTO.setChangeProfit(ProfitTypeEnum.getByType(record.getChangeProfit()));
         changeFlowExcelDTO.setChangeProfitDesc(record.getChangeProfitDesc());
         return changeFlowExcelDTO;

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=用户所属所有部门的上级(包括本部门)负责人链)