Merge branch 'feature-changeFlow-221110' of…

Merge branch 'feature-changeFlow-221110' of https://yxwbgit.mail.netease.com/yx-qc-change-flow/yanxuan-qc-change-system into feature-changeFlow-221110

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

@@ -14,7 +14,7 @@ public interface ChangeConfigService {
 
     ChangeConfig queryChangeConfig(Long id,Long sonChangeClassId);
 
-    ChangeConfigPo queryInfoPo(Long id);
+    ChangeConfigPo queryInfoPo(Long parentChangeClassId,Long sonChangeClassId);
 
     ChangeConfig queryChangeType(Long parentChangeClassId,Long sonChangeClassId);
 

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

@@ -27,8 +27,8 @@ public class ChangeConfigServiceImpl implements ChangeConfigService {
     }
 
     @Override
-    public ChangeConfigPo queryInfoPo(Long id) {
-        return mapper.queryInfoPo(id);
+    public ChangeConfigPo queryInfoPo(Long parentChangeClassId,Long sonChangeClassId) {
+        return mapper.queryInfoPo(parentChangeClassId,sonChangeClassId);
     }
 
     @Override

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/mapper/ChangeConfigMapper.java

@@ -28,7 +28,8 @@ public interface ChangeConfigMapper extends tk.mybatis.mapper.common.Mapper<Chan
 
     ChangeConfig queryInfo(@Param("id") Long id,@Param("sonChangeClassId") Long sonChangeClassId);
 
-    ChangeConfigPo queryInfoPo(@Param("id") Long id);
+    ChangeConfigPo queryInfoPo(@Param("parentChangeClassId")Long parentChangeClassId,
+                               @Param("sonChangeClassId")Long sonChangeClassId);
 
     @Delete("delete from TB_YX_QC_CHANGE_CONFIG where id = #{id}")
     void deleteById(@Param("id") Long id);

yanxuan-qc-change-system-dal/src/main/resources/mybatis/mapper/ChangeConfigMapper.xml

@@ -83,8 +83,11 @@
     from TB_YX_QC_CHANGE_CONFIG
     <where>
       1=1
-      <if test="id != null">
-        and id = #{id}
+      <if test="parentChangeClassId != null ">
+        and parent_change_class_id = #{parentChangeClassId}
+      </if>
+      <if test="sonChangeClassId != null ">
+        and son_change_class_id = #{sonChangeClassId}
       </if>
     </where>
   </select>

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

@@ -17,7 +17,7 @@ import java.util.List;
 public interface FlowRpcSupplierService {
 
     /**
-     * 邮件通知接口
+     * 供应商模糊查询
      * @return
      */
     @GetMapping("/api/supplier/getSupplierInfo.json")