Merge remote-tracking branch 'origin/feature-changeFlow-221110' into feature-changeFlow-221110

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

@@ -63,6 +63,7 @@ import com.netease.mail.yanxuan.change.dal.entity.ChangeFile;
 import com.netease.mail.yanxuan.change.dal.entity.ChangeRecord;
 import com.netease.mail.yanxuan.change.dal.entity.ChangeType;
 import com.netease.mail.yanxuan.change.dal.mapper.ChangeRecordMapper;
+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.req.ChangeExecConfigReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeExecProject;
@@ -72,6 +73,7 @@ import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowDeliverReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowFile;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowListQueryReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowSubmitReq;
+import com.netease.mail.yanxuan.change.dal.meta.model.rpc.GoodsResponseRpc;
 import com.netease.mail.yanxuan.change.dal.meta.model.vo.BasicChangeFlowVO;
 import com.netease.mail.yanxuan.change.dal.meta.model.vo.CategoryInfoVO;
 import com.netease.mail.yanxuan.change.dal.meta.model.vo.ChangeFlowExecVO;
@@ -143,8 +145,14 @@ public class ChangeFlowBiz {
         log.info("[create] createReq={}, uid:{}", JSON.toJSONString(changeFlowCreateReq), uid);
         // 校验变更主体
         checkSubject(changeFlowCreateReq);
+        Long parentChangeClassId = changeFlowCreateReq.getParentChangeClassId();
+        Long sonChangeClassId = changeFlowCreateReq.getSonChangeClassId();
+        // 获取工单负责人
+        GoodsResponseRpc goodsResponseRpc = interiorChangeConfigService.queryCommanderInfo(ChangeCommanderPO.builder()
+            .parentChangeClassId(parentChangeClassId).sonChangeClassId(sonChangeClassId).build());
+        Assert.notNull(goodsResponseRpc, "未查询到负责人信息");
         // 检验是否需要资料
-        ChangeConfig changeConfig = changeConfigService.getSonChange(changeFlowCreateReq.getSonChangeClassId());
+        ChangeConfig changeConfig = changeConfigService.getSonChange(sonChangeClassId);
         Assert.notNull(changeConfig, "二级变更类型不存在");
         Integer needFile = changeConfig.getNeedFile();
         if (NeedFileEnum.NEED.getStatus().equals(needFile)) {
@@ -171,6 +179,8 @@ public class ChangeFlowBiz {
         // 查询工单详情
         FlowDataDTO flowDataDTO = flowService.flowDetail(flowId);
         String nodeId = flowDataDTO.getFlowMeta().getCurrNodeDataList().get(0).getNodeId();
+        // 获取负责人信息
+
         String changeCommander = changeFlowCreateReq.getChangeCommander();
         // 保存工单数据
         ChangeRecord changeRecord = buildChangeRecord(flowId, nodeId, changeFlowCreateReq, changeCommander, uid);
@@ -566,6 +576,7 @@ public class ChangeFlowBiz {
         if (changeRecord == null) {
             throw ExceptionFactory.createBiz(ResponseCode.ERROR_FLOW_ID, "工单id不存在");
         }
+        log.debug("[detail] detail:{}", JSON.toJSONString(changeRecord));
         ChangeFlowVO changeFlowVO = new ChangeFlowVO();
         changeFlowVO.setId(changeRecord.getId());
         changeFlowVO.setFlowId(changeRecord.getFlowId());

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

 package com.netease.mail.yanxuan.change.dal.meta.model.po;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.List;
 
@@ -10,6 +13,9 @@ import java.util.List;
  * 用来查询最终负责人信息
  */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 public class ChangeCommanderPO {
 
     /**