add: 查询负责人信息

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

@@ -180,13 +180,12 @@ public class ChangeFlowBiz {
         FlowDataDTO flowDataDTO = flowService.flowDetail(flowId);
         String nodeId = flowDataDTO.getFlowMeta().getCurrNodeDataList().get(0).getNodeId();
         // 获取负责人信息
-
-        String changeCommander = changeFlowCreateReq.getChangeCommander();
+        String changeCommander = goodsResponseRpc.getEmail();
         // 保存工单数据
         ChangeRecord changeRecord = buildChangeRecord(flowId, nodeId, changeFlowCreateReq, changeCommander, uid);
         changeFlowService.saveRecord(changeRecord);
         // 保存变更行动方案记录
-        List<ChangeExecRecord> changeExecRecords = buildChangeExecRecord(changeRecord.getId(), changeExecProject);
+        List<ChangeExecRecord> changeExecRecords = buildChangeExecRecord(changeRecord.getId(), changeExecProject, uid);
         changeExecRecords.forEach(exec->changeFlowExecService.saveRecord(exec));
         List<ChangeFile> allFiles = new ArrayList<>();
         // 变更前后图片/视频，非必填
@@ -238,13 +237,16 @@ public class ChangeFlowBiz {
         }).collect(Collectors.toList());
     }
 
-    private List<ChangeExecRecord> buildChangeExecRecord(Long changeRecordId, List<ChangeExecConfigReq> changeExecProject) {
+    private List<ChangeExecRecord> buildChangeExecRecord(Long changeRecordId,
+        List<ChangeExecConfigReq> changeExecProject, String uid) {
         return changeExecProject.stream().map(c -> {
             ChangeExecRecord changeExecRecord = new ChangeExecRecord();
             changeExecRecord.setChangeRecordId(changeRecordId);
             changeExecRecord.setChangeExecDepartment(c.getChangeExecDepartment());
             changeExecRecord.setChangeExecUserType(c.getChangeExecUserType());
             changeExecRecord.setChangeExecUser(c.getChangeExecUser());
+            // 查询对应的负责人
+            // interiorChangeConfigService.queryCommanderInfo(c.getChangeExecUserType(), c.getChangeExecUser(), uid);
             changeExecRecord.setChangeRiskDesc(c.getChangeRiskDesc());
             changeExecRecord.setChangeExecProject(c.getChangeExecProject());
             changeExecRecord.setChangeChecking(c.getChangeChecking());

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

@@ -2,6 +2,7 @@ package com.netease.mail.yanxuan.change.biz.service;
 
 import com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeCommanderPO;
 import com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeGoodsPrincipalPO;
+import com.netease.mail.yanxuan.change.dal.meta.model.rpc.CommanderResponse;
 import com.netease.mail.yanxuan.change.dal.meta.model.rpc.GoodsResponseRpc;
 
 import java.util.List;
@@ -18,4 +19,12 @@ public interface InteriorChangeConfigService {
 
     Map<Long, ChangeGoodsPrincipalPO> queryGoodsPrincipalInfo(List<Long> itemIds);
 
+    /**
+     * 查询负责人信息
+     * @param changeExecUserType
+     * @param changeExecUser
+     * @return
+     */
+    CommanderResponse queryCommanderEmail(Integer changeExecUserType, String changeExecUser, String uid);
+
 }

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/InteriorChangeConfigServiceImpl.java

 package com.netease.mail.yanxuan.change.biz.service.impl;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
+
 import com.alibaba.fastjson.JSONObject;
 import com.netease.mail.yanxuan.change.biz.meta.exception.ExceptionFactory;
 import com.netease.mail.yanxuan.change.biz.service.InteriorChangeConfigService;
@@ -10,6 +22,7 @@ import com.netease.mail.yanxuan.change.common.enums.ChangeSubjectEnum;
 import com.netease.mail.yanxuan.change.dal.entity.ChangeConfig;
 import com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeCommanderPO;
 import com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeGoodsPrincipalPO;
+import com.netease.mail.yanxuan.change.dal.meta.model.rpc.CommanderResponse;
 import com.netease.mail.yanxuan.change.dal.meta.model.rpc.GoodsPurchaseRpc;
 import com.netease.mail.yanxuan.change.dal.meta.model.rpc.GoodsResponseRpc;
 import com.netease.mail.yanxuan.change.dal.meta.model.rpc.GoodsResponseSqeRpc;
@@ -20,12 +33,6 @@ import com.netease.mail.yanxuan.change.integration.flow.supplier.FlowRpcSupplier
 import com.netease.mail.yanxuan.change.integration.flow.supplier.req.SupplierRelatedUserReq;
 import com.netease.mail.yanxuan.change.integration.flow.supplier.rsp.SupplierUserRsp;
 import com.netease.yanxuan.flowx.sdk.meta.controller.communal.AjaxResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
 
 /**
  * @author WangJiaXiang
@@ -91,7 +98,7 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
      * @param commander   商品的关联角色
      * @return
      */
-    private GoodsResponseRpc queryGoodsCommander(ChangeCommanderEnum commanderEnum,List<Long> goodsInfos,String commander){
+    public GoodsResponseRpc queryGoodsCommander(ChangeCommanderEnum commanderEnum,List<Long> goodsInfos,String commander){
         if (commanderEnum.getId() != 3 || goodsInfos == null || goodsInfos.size() == 0 || commander == null){
             return null;
         }
@@ -252,6 +259,24 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
         return map;
     }
 
+    @Override
+    public CommanderResponse queryCommanderEmail(Integer changeExecUserType, String changeExecUser, String uid) {
+        ChangeCommanderEnum changeCommanderEnum = ChangeCommanderEnum.getChangeCommanderEnum(changeExecUserType);
+        Assert.notNull(changeCommanderEnum, "变更负责人类型错误");
+        CommanderResponse commanderResponse= new CommanderResponse();
+        switch (changeCommanderEnum) {
+            case COMMANDER_ORIGINATOR:
+                commanderResponse.setEmail(uid);
+                break;
+            case FIXED_PERSON:
+                commanderResponse.setEmail(changeExecUser);
+                break;
+            case GOODS_ASSOCIATED:
+
+        }
+        return null;
+    }
+
     /**
      * 请求数据解析以及装载
      * @param type 1:BU  2:计划

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/entity/ChangeExecRecord.java

@@ -54,6 +54,11 @@ public class ChangeExecRecord {
     private String changeExecUser;
 
     /**
+     * 变更行动人（不同类型存储不同内容）
+     */
+    private String changeExecUserEmail;
+
+    /**
      * 变更风险描述
      */
     private String changeRiskDesc;

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/req/ChangeFlowCreateReq.java

@@ -50,7 +50,6 @@ public class ChangeFlowCreateReq {
     /**
      * 变更负责人
      */
-    @NotBlank(message = "变更负责人不能为空")
     private String changeCommander;
 
     /**

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/rpc/CommanderResponse.java

+/**
+ * @(#)CommanderResponse.java, 2022/12/6.
+ * <p/>
+ * Copyright 2022 Netease, Inc. All rights reserved.
+ * NETEASE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ */
+package com.netease.mail.yanxuan.change.dal.meta.model.rpc;
+
+import lombok.Data;
+
+/**
+ * @Author zcwang
+ * @Date 2022/12/6
+ */
+@Data
+public class CommanderResponse {
+
+    /**
+     * 用户名
+     */
+    private String name;
+    /**
+     * 邮箱
+     */
+    private String email;
+}
\ No newline at end of file