feat: 当变更主体为“商品变更”，变更行动人“商品关联角色”，增加关联角色选项“合规”

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

@@ -256,6 +256,7 @@ public class ChangeFlowExportCallback implements DesCallbackService {
                                     changeFlowExcelDTO.setPurchase("/");
                                     changeFlowExcelDTO.setGoodsProject("/");
                                     changeFlowExcelDTO.setGoodsSqe("/");
+                                    changeFlowExcelDTO.setGoodsCompliance("/");
                                 } else {
                                     buildGoodsPrincipal(changeGoodsPrincipalPO, changeFlowExcelDTO);
                                 }
@@ -299,6 +300,7 @@ public class ChangeFlowExportCallback implements DesCallbackService {
                         changeFlowExcelDTO.setPurchase(null);
                         changeFlowExcelDTO.setGoodsSqe(null);
                         changeFlowExcelDTO.setGoodsProject(null);
+                        changeFlowExcelDTO.setGoodsCompliance(null);
                         // 组装行动项相关信息
                         this.obtainChangeExec(changeExecRecord, changeFlowExcelDTO, userListInfo);
                         this.obtainOther(record, changeFlowExcelDTO);
@@ -333,15 +335,19 @@ public class ChangeFlowExportCallback implements DesCallbackService {
         String goodsProjectEmail = StringUtils.isBlank(changeGoodsPrincipalPO.getGoodsProjectEmail()) ? "" : changeGoodsPrincipalPO.getGoodsProjectEmail();
         String goodsSqeName = StringUtils.isBlank(changeGoodsPrincipalPO.getGoodsSqeName()) ? "" : changeGoodsPrincipalPO.getGoodsSqeName();
         String goodsSqeEmail = StringUtils.isBlank(changeGoodsPrincipalPO.getGoodsSqeEmail()) ? "" : changeGoodsPrincipalPO.getGoodsSqeEmail();
+        String goodsComplianceName = StringUtils.isBlank(changeGoodsPrincipalPO.getGoodsComplianceName()) ? "" : changeGoodsPrincipalPO.getGoodsComplianceName();
+        String goodsComplianceEmail = StringUtils.isBlank(changeGoodsPrincipalPO.getGoodsComplianceEmail()) ? "" : changeGoodsPrincipalPO.getGoodsComplianceEmail();
 
         String functionary = functionaryName + functionaryEmail;
         String purchase = purchaseName + purchaseEmail;
         String goodsProject = goodsProjectName + goodsProjectEmail;
         String goodsSqe = goodsSqeName + goodsSqeEmail;
+        String goodsCompliance = goodsComplianceName + goodsComplianceEmail;
         changeFlowExcelDTO.setFunctionary(StringUtils.isBlank(functionary) ? "/" :functionary);
         changeFlowExcelDTO.setPurchase(StringUtils.isBlank(purchase) ? "/" :purchase);
         changeFlowExcelDTO.setGoodsProject(StringUtils.isBlank(goodsProject) ? "/" :goodsProject);
         changeFlowExcelDTO.setGoodsSqe(StringUtils.isBlank(goodsSqe) ? "/" :goodsSqe);
+        changeFlowExcelDTO.setGoodsCompliance(StringUtils.isBlank(goodsCompliance) ? "/" :goodsCompliance);
     }
 
     private void obtainChangeExec(ChangeExecRecord changeExecRecord, ChangeFlowExcelDTO changeFlowExcelDTO,

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

@@ -77,6 +77,18 @@ public class AppConfig {
     private String sqeEmail;
 
     /**
+     * 商品关联合规兜底人名
+     */
+    @Value("${change.goods.compliance.name:}")
+    private String complianceName;
+
+    /**
+     * 商品关联合规兜底邮箱
+     */
+    @Value("${change.goods.compliance.email:}")
+    private String complianceEmail;
+
+    /**
      * 变更管理QM
      */
     @Value("${changeManageQM:cuiyixian@corp.netease.com}")

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

@@ -204,6 +204,16 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
                     emails.add(rpc);
                 }
             }
+        } else if (ChangePrincipalEnum.COMPLIANCE.getName().equals(commander)) {
+            // TODO: 待合规RPC接口提供后实现
+            logger.warn("[queryGoodsCommander] 合规类型暂未实现，goodsInfos={}", goodsInfos);
+            // 暂时使用兜底配置
+            GoodsResponseRpc rpc = new GoodsResponseRpc();
+            rpc.setEmail(appConfig.getComplianceEmail());
+            rpc.setName(appConfig.getComplianceName());
+            if (StringUtils.isNotBlank(rpc.getEmail()) && StringUtils.isNotBlank(rpc.getName())) {
+                emails.add(rpc);
+            }
         }
         //逻辑发生变更
         /*
@@ -256,6 +266,8 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
             req.setSearchType(SupplierChangePrincipalEnum.SQE.getType());
         } else if (SupplierChangePrincipalEnum.GOODS_BU.getName().equals(commander)) {
             req.setSearchType(SupplierChangePrincipalEnum.GOODS_BU.getType());
+        } else if (SupplierChangePrincipalEnum.COMPLIANCE.getName().equals(commander)) {
+            req.setSearchType(SupplierChangePrincipalEnum.COMPLIANCE.getType());
         } else {
             throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST, "供应商角色类型错误");
         }
@@ -359,6 +371,14 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
                 goodsRpc(ChangePrincipalEnum.SQE.getType(), data.getRealName(), map.get(itemId));
             }
         }
+        //合规
+        // TODO: 待合规RPC接口提供后实现
+        for (Long itemId: itemIds) {
+            // 暂时使用兜底配置
+            map.get(itemId).setGoodsComplianceName(appConfig.getComplianceName());
+            map.get(itemId).setGoodsComplianceEmail(appConfig.getComplianceEmail());
+            goodsRpc(ChangePrincipalEnum.COMPLIANCE.getType(), appConfig.getComplianceName(), map.get(itemId));
+        }
         return map;
     }
 
@@ -527,6 +547,11 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
                     goodsRpc.setGoodsSqeName(appConfig.getSqeName());
                     goodsRpc.setGoodsSqeEmail(appConfig.getSqeEmail());
                     break;
+                case 5:
+                    //合规
+                    goodsRpc.setGoodsComplianceName(appConfig.getComplianceName());
+                    goodsRpc.setGoodsComplianceEmail(appConfig.getComplianceEmail());
+                    break;
             }
 
         }

yanxuan-qc-change-system-common/src/main/java/com/netease/mail/yanxuan/change/common/enums/ChangePrincipalEnum.java

@@ -9,7 +9,8 @@ public enum ChangePrincipalEnum {
     GOODS_BU(1,"商品开发"),
     PURCHASE(2,"采购"),
     PROSPECTUS(3,"计划"),
-    SQE(4,"SQE");
+    SQE(4,"SQE"),
+    COMPLIANCE(5,"合规");
 
 
     ChangePrincipalEnum(Integer type, String name) {

yanxuan-qc-change-system-common/src/main/java/com/netease/mail/yanxuan/change/common/enums/SupplierChangePrincipalEnum.java

@@ -14,7 +14,8 @@ public enum SupplierChangePrincipalEnum {
     PURCHASE(1,"采购"),
     PROSPECTUS(2,"计划"),
     SQE(3,"SQE"),
-    GOODS_BU(4,"商品开发");
+    GOODS_BU(4,"商品开发"),
+    COMPLIANCE(5,"合规");
 
 
     SupplierChangePrincipalEnum(Integer type, String name) {

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

@@ -49,5 +49,15 @@ public class ChangeGoodsPrincipalPO {
      */
     private String goodsSqeEmail;
 
+    /**
+     * 合规 名称
+     */
+    private String goodsComplianceName;
+
+    /**
+     * 合规 邮箱
+     */
+    private String goodsComplianceEmail;
+
 
 }

yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/excel/ChangeFlowExcelDTO.java

@@ -166,6 +166,12 @@ public class ChangeFlowExcelDTO {
     private String goodsProject;
 
     /**
+     * 合规负责人
+     */
+    @Excel(name = "合规负责人")
+    private String goodsCompliance;
+
+    /**
      * 变更行动部门
      */
     @Excel(name = "变更行动部门")

yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/excel/ChangeFlowExcelVo.java

@@ -171,56 +171,62 @@ public class ChangeFlowExcelVo {
     private String goodsProjectName;
 
     /**
+     * 合规负责人
+     */
+    @ExcelTitleName(title = "合规负责人", order = 26)
+    private String goodsCompliance;
+
+    /**
      * 变更行动部门
      */
-    @ExcelTitleName(title = "变更行动部门", order = 26)
+    @ExcelTitleName(title = "变更行动部门", order = 27)
     private String execDepartment;
 
     /**
      * 变更行动人
      */
-    @ExcelTitleName(title = "变更行动人", order = 27)
+    @ExcelTitleName(title = "变更行动人", order = 28)
     private String changeExecUser;
 
     /**
      * 行动项变更风险描述
      */
-    @ExcelTitleName(title = "变更风险描述", order = 28)
+    @ExcelTitleName(title = "变更风险描述", order = 29)
     private String changeExecRiskDesc;
 
     /**
      * 行动项
      */
-    @ExcelTitleName(title = "行动项", order = 29)
+    @ExcelTitleName(title = "行动项", order = 30)
     private String changeExecProject;
 
     /**
      * 变更验证措施
      */
-    @ExcelTitleName(title = "变更验证措施", order = 30)
+    @ExcelTitleName(title = "变更验证措施", order = 31)
     private String changeChecking;
     /**
      * 行动完成时间
      */
-    @ExcelTitleName(title = "行动完成时间", order = 31)
+    @ExcelTitleName(title = "行动完成时间", order = 32)
     private String changeExecFinishTime;
 
     /**
      * 行动完成情况
      */
-    @ExcelTitleName(title = "行动完成情况", order = 32)
+    @ExcelTitleName(title = "行动完成情况", order = 33)
     private String changeExecFinishDesc;
 
     /**
      * 变更结论
      */
-    @ExcelTitleName(title = "变更结论", order = 33)
+    @ExcelTitleName(title = "变更结论", order = 34)
     private String changeResult;
 
     /**
      * 变更完结时间
      */
-    @ExcelTitleName(title = "变更完结时间", order = 34)
+    @ExcelTitleName(title = "变更完结时间", order = 35)
     private Integer changeEndTime;
 
 
@@ -327,7 +333,11 @@ public class ChangeFlowExcelVo {
         excelCell = new ExcelCell();
         excelCell.setValue(dto.getGoodsProject());
         cellInfo.add(excelCell);
-        // 26.变更行动部门
+        // 26.合规负责人
+        excelCell = new ExcelCell();
+        excelCell.setValue(dto.getGoodsCompliance());
+        cellInfo.add(excelCell);
+        // 27.变更行动部门
         excelCell = new ExcelCell();
         excelCell.setValue(dto.getExecDepartment());
         cellInfo.add(excelCell);

yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/flow/supplier/req/SupplierRelatedUserReq.java

@@ -12,7 +12,7 @@ import java.util.List;
 public class SupplierRelatedUserReq {
 
     /**
-     * 搜索类型(1-采购 2-计划 3-SQE 4-商品开发)
+     * 搜索类型(1-采购 2-计划 3-SQE 4-商品开发 5-合规)
      */
     private Integer searchType;