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/service/impl/InteriorChangeConfigServiceImpl.java

@@ -69,7 +69,7 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
         //直接排除 选项为固定人 或者发起人
         if (changeCommanderEnum.getId() == 1 || changeCommanderEnum.getId() == 2){
             //固定人或者发起人;
-            rpc.setChangeCommander(changeConfig.getChangeCommander());
+            rpc.setEmail(changeConfig.getChangeCommander());
             return rpc;
         }
         ChangeSubjectEnum changeSubjectEnum = ChangeSubjectEnum.getChangeSubjectEnum(changeConfig.getChangeSubject());
@@ -170,7 +170,7 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
      */
     private GoodsResponseRpc queryChangeSupplier(ChangeCommanderEnum commanderEnum,String changeSupplierId,String commander){
         GoodsResponseRpc rpc = new GoodsResponseRpc();
-        if (commanderEnum.getId() != 4 || changeSupplierId == null || commander == null){
+        if (commanderEnum.getId() != ChangeCommanderEnum.SUPPLIERS_ASSOCIATED.getId() || changeSupplierId == null || commander == null){
             return null;
         }
         SupplierRelatedUserReq req = new SupplierRelatedUserReq();

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

@@ -18,8 +18,14 @@ import java.util.List;
 @Builder
 public class ChangeCommanderPO {
 
+    /**
+     * 一级类型ID
+     */
     private Long parentChangeClassId;
 
+    /**
+     * 二级类型ID
+     */
     private Long sonChangeClassId;
 
     /**

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

@@ -21,24 +21,7 @@ public class GoodsResponseRpc {
     private String email;
 
     /**
-     * 固定人 || 发起人返回结果
-     */
-    private String changeCommander;
-
-    /**
      * 计数器
      */
     private Integer occurrenceNumber;
-
-    /**
-     *  供应商返回结果
-     */
-    private String supplierId;
-
-    /**
-     *  供应商名称
-     */
-    private String supplierName;
-
-
 }

yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/flow/ius/IusRpcService.java

@@ -23,12 +23,27 @@ import java.util.List;
 @MissaClient(serviceCode = "yanxuan-ius")
 public interface IusRpcService {
 
+    /**
+     * 获取指定用户信息，是否返回操作记录、关联的角色信息。当uid和userId都传时，需保证指向同一个用户。
+     * @param uid
+     * @return
+     */
     @GetMapping("/v1/qc/user/get")
     AjaxResponse<IusUserInfoRsp> queryUserInfo(@RequestParam(name = "uid")String uid);
 
+    /**
+     * 查询指定用户部门下的上级部门(含本部门)负责人链(支持一级或多级)
+     * @param uid
+     * @return
+     */
     @GetMapping("/v1/qc/allTeam/pos/queryLeaderChain")
     AjaxResponse<List<OrgPosLeaderChainRsp>> queryLeaderChain(@RequestParam(name = "uid")String uid);
 
+    /**
+     * 查询用户的负责人链(直接上级和所有上级)，返回(key=用户邮箱，value=用户所属所有部门的上级(包括本部门)负责人链)
+     * @param uid
+     * @return
+     */
     @PostMapping("/v1/qc/user/queryLeaderChain")
     AjaxResponse<HashMap<String, List<SecondaryDepartments>>> queryDepartment(@RequestBody IusDepartmentReq uid);