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

@@ -154,17 +154,18 @@ public class ChangeFlowBiz {
             List<ItemVO> itemVOS = JSON.parseArray(changeItems, ItemVO.class);
             itemIds = itemVOS.stream().map(ItemVO::getItemId).collect(Collectors.toList());
         }
-        // 获取工单负责人
-        GoodsResponseRpc goodsResponseRpc = interiorChangeConfigService.queryCommanderInfo(
-            ChangeCommanderPO.builder().parentChangeClassId(parentChangeClassId).sonChangeClassId(sonChangeClassId)
-                .changeSupplierId(changeFlowCreateReq.getChangeSupplier()).goodsInfos(itemIds).build());
         // 工单负责人
         String changeCommander;
-        if (goodsResponseRpc == null) {
-            // todo:获取负责人信息
-            changeCommander = appConfig.getTestEmail();
-        } else {
+        // 获取工单负责人
+        GoodsResponseRpc goodsResponseRpc = null;
+        try {
+            goodsResponseRpc = interiorChangeConfigService.queryCommanderInfo(
+                ChangeCommanderPO.builder().parentChangeClassId(parentChangeClassId).sonChangeClassId(sonChangeClassId)
+                    .changeSupplierId(changeFlowCreateReq.getChangeSupplier()).goodsInfos(itemIds).build());
             changeCommander = goodsResponseRpc.getEmail();
+        } catch (Exception e) {
+            log.error("[op:queryCommanderInfo] error, e:{}", e);
+            changeCommander = appConfig.getTestEmail();
         }
         // Assert.notNull(goodsResponseRpc, "未查询到负责人信息");
         // 检验是否需要资料
@@ -261,11 +262,15 @@ public class ChangeFlowBiz {
             changeExecRecord.setChangeExecUserType(c.getChangeExecUserType());
             changeExecRecord.setChangeExecUser(c.getChangeExecUser());
             // 查询对应的负责人
-            CommanderResponse commanderResponse = interiorChangeConfigService
-                .queryCommanderEmail(c.getChangeExecUserType(), c.getChangeExecUser(), changeFlowCreateReq, uid);
-            changeExecRecord.setChangeExecUserEmail(
-                StringUtils.isNotBlank(commanderResponse.getEmail()) ? commanderResponse.getEmail()
-                    : appConfig.getTestEmail());
+            CommanderResponse commanderResponse = null;
+            try {
+                commanderResponse = interiorChangeConfigService
+                    .queryCommanderEmail(c.getChangeExecUserType(), c.getChangeExecUser(), changeFlowCreateReq, uid);
+                changeExecRecord.setChangeExecUserEmail(commanderResponse.getEmail());
+            } catch (Exception e) {
+                log.error("[op:queryCommanderEmail] error, e:{}",e);
+                changeExecRecord.setChangeExecUserEmail(appConfig.getTestEmail());
+            }
             changeExecRecord.setChangeRiskDesc(c.getChangeRiskDesc());
             changeExecRecord.setChangeExecProject(c.getChangeExecProject());
             changeExecRecord.setChangeChecking(c.getChangeChecking());
@@ -602,7 +607,7 @@ public class ChangeFlowBiz {
         changeFlowVO.setId(changeRecord.getId());
         changeFlowVO.setFlowId(changeRecord.getFlowId());
         changeFlowVO.setParentChangeClassId(changeRecord.getParentChangeClassId());
-        changeFlowVO.setSonChangeClassId(changeFlowVO.getSonChangeClassId());
+        changeFlowVO.setSonChangeClassId(changeRecord.getSonChangeClassId());
         changeFlowVO.setChangeSubject(changeRecord.getChangeSubject());
         ChangeType parentChangeType = changeTypeService.getChangeTypeById(changeRecord.getParentChangeClassId());
         if (parentChangeType == null) {

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

@@ -35,7 +35,8 @@ public class ChangeFlowExecServiceImpl implements ChangeFlowExecService {
         if (CollectionUtils.isNotEmpty(changeExecRecords)) {
             return changeExecRecords.stream()
                 .map(c -> ChangeFlowExecVO.builder().changeRecordId(c.getChangeRecordId())
-                    .changeExecDepartment(c.getChangeExecDepartment()).changeExecUser(c.getChangeExecUser())
+                    .changeExecDepartment(c.getChangeExecDepartment()).changeExecUserType(c.getChangeExecUserType())
+                    .changeExecUser(c.getChangeExecUser()).changeExecUserEmail(c.getChangeExecUserEmail())
                     .changeRiskDesc(c.getChangeRiskDesc()).changeExecProject(c.getChangeExecProject())
                     .changeChecking(c.getChangeChecking()).changeExecFinishTime(c.getChangeExecFinishTime())
                     .changeExecFinishDesc(c.getChangeExecFinishDesc()).build())

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

@@ -31,11 +31,21 @@ public class ChangeFlowExecVO {
     private String changeExecDepartment;
 
     /**
+     * 变更行动人类型
+     */
+    private Integer changeExecUserType;
+
+    /**
      * 变更行动人（不同类型存储不同内容）
      */
     private String changeExecUser;
 
     /**
+     * 变更行动人（不同类型存储不同内容）
+     */
+    private String changeExecUserEmail;
+
+    /**
      * 变更风险描述
      */
     private String changeRiskDesc;