modify: 导出发起人改为和详情一致

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

@@ -1209,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

@@ -34,9 +34,11 @@ 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.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;
@@ -122,8 +124,15 @@ public class ChangeFlowExportCallback implements DesCallbackService {
         if (CollectionUtils.isEmpty(changeRecords)) {
             return Lists.newArrayList();
         }
-        // 提前查询所有行动项用户名
+        // 提前查询所有创建人及行动项用户名
         List<String> allExecUserEmailList = new ArrayList<>();
+        // 过滤不为供应商的创建人
+        List<String> creatorList = changeRecords.stream()
+            .filter(c -> !CreateSourceEnum.TONG_ZHOU.getType().equals(c.getCreateSource()))
+            .map(ChangeRecord::getCreator).collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(creatorList)) {
+            allExecUserEmailList.addAll(creatorList);
+        }
         for (ChangeRecord changeRecord : changeRecords) {
             List<ChangeExecRecord> changeExecRecords = changeExecRecordMapper.selectByChangeRecordId(changeRecord.getId());
             List<String> collect = changeExecRecords.stream()
@@ -184,7 +193,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, userListInfo);
                             changeFlowExcelDTO.setSupplier("/");
                             changeFlowExcelDTO.setChangeItem(itemVO.getItemName());
                             changeFlowExcelDTO.setSPUId(itemId);
@@ -251,7 +260,7 @@ public class ChangeFlowExportCallback implements DesCallbackService {
                     // 供应商变更，以行动项循环
                     for (ChangeExecRecord changeExecRecord : changeExecRecords) {
                         // 组装通用信息，除商品信息，行动项以外其他字段一致
-                        ChangeFlowExcelDTO changeFlowExcelDTO = this.obtainCommon(record, changeSubjectEnum);
+                        ChangeFlowExcelDTO changeFlowExcelDTO = this.obtainCommon(record, changeSubjectEnum, userListInfo);
                         changeFlowExcelDTO.setSupplier(StringUtils.isBlank(record.getChangeSupplier())? "/": record.getChangeSupplier());
                         changeFlowExcelDTO.setChangeItem(null);
                         changeFlowExcelDTO.setSPUId(null);
@@ -335,23 +344,28 @@ public class ChangeFlowExportCallback implements DesCallbackService {
      * @param changeSubjectEnum
      * @return
      */
-    private ChangeFlowExcelDTO obtainCommon(ChangeRecord record, ChangeSubjectEnum changeSubjectEnum) {
+    private ChangeFlowExcelDTO obtainCommon(ChangeRecord record, ChangeSubjectEnum changeSubjectEnum,
+        List<IusUserInfoRsp> userListInfo) {
         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 {
+
+        }
         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());
         changeFlowExcelDTO.setChangeReason(record.getChangeReason());
         changeFlowExcelDTO.setChangeContent(record.getChangeContent());
         changeFlowExcelDTO.setChangeRiskDesc(record.getChangeRiskDesc());
-        // todo:变更收益类型和前端核对枚举
         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/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;
 
     /**
      * 变更负责部门名