From 06edad895de980d32d2c9822030e4149aa5e3dfa Mon Sep 17 00:00:00 2001
From: zhengyf <zyf654042662@163.com>
Date: Mon, 7 Jul 2025 17:23:34 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=B8=BB=E6=95=B0=E6=8D=AE=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=90=88=E5=B9=B6=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MdmModuleServiceImpl.java     | 16 ++++++++++++++++
 .../mdmModuleDb/entity/MdmModuleDbEntity.java  | 18 ++++++++++++++++++
 .../mdmModuleDb/entity/MdmModuleDbEntity.xml   | 14 ++++++++++++--
 3 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java b/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java
index 01bb0002..f8e00846 100644
--- a/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java
+++ b/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java
@@ -443,6 +443,22 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
             for (int i = 0; i < mdmModuleDbEntities.size(); i++) {
                 if ("1".equals(mdmModuleDbEntities.get(i).getDbType()) || "2".equals(mdmModuleDbEntities.get(i).getDbType())) {
                     dbEntities.add(mdmModuleDbEntities.get(i));
+                    //查询合并规则。add by zyd 20250707
+                    List<String> filedNames=new ArrayList<>();
+                    if (mdmModuleDbEntities.get(i).getMergeRules() != null && !"".equals(mdmModuleDbEntities.get(i).getMergeRules())) {
+                        String mergeRulesIds = mdmModuleDbEntities.get(i).getMergeRules();
+                        String[] split = mergeRulesIds.split(",");
+                        for (String filedId : split) {
+                            MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity();
+                            mdmModuleDbFiledsEntity.setId(filedId);
+                            List<MdmModuleDbFiledsEntity> fileds = mdmModuleDbFiledsDao.query(mdmModuleDbFiledsEntity);
+                            if(fileds.size()!=0){
+                                filedNames.add(fileds.get(0).getChName());
+                            }
+
+                        }
+                    }
+                    mdmModuleDbEntities.get(i).setMergeRulesStr(String.join(",",filedNames));
                 }
             }
         }
diff --git a/base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.java b/base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.java
index 71ad1ac2..871e621e 100644
--- a/base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.java
+++ b/base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.java
@@ -27,7 +27,25 @@ public class MdmModuleDbEntity extends BaseEntity {
     /**  数据类型 1、新增 2、修改 */
     private String dataType;
     private List<MdmModuleDbFiledsEntity> sublistMdmModuleDbFileds;
+    /** 合并规则，字段id使用逗号隔开 */
+    private String mergeRules;
+    private String mergeRulesStr;
 
+    public String getMergeRules() {
+        return mergeRules;
+    }
+
+    public void setMergeRules(String mergeRules) {
+        this.mergeRules = mergeRules;
+    }
+
+    public String getMergeRulesStr() {
+        return mergeRulesStr;
+    }
+
+    public void setMergeRulesStr(String mergeRulesStr) {
+        this.mergeRulesStr = mergeRulesStr;
+    }
 
     public String getMdmId() {
         return mdmId;
diff --git a/base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.xml b/base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.xml
index c680877b..b9bb50f0 100644
--- a/base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.xml
+++ b/base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.xml
@@ -16,6 +16,7 @@
         <result property="sts" column="sts" jdbcType="VARCHAR"/>
         <result property="org_id" column="org_id" jdbcType="VARCHAR"/>
         <result property="companyId" column="company_id" jdbcType="VARCHAR"/>
+        <result property="mergeRules" column="merge_rules" jdbcType="VARCHAR"/>
     </resultMap>
     <!-- 查询的字段-->
     <sql id="MdmModuleDbEntity_Base_Column_List">
@@ -32,6 +33,7 @@
         ,sts 
         ,org_id 
         ,company_id 
+        ,merge_rules
      </sql>
     <!-- 查询 采用==查询 -->
     <select id="entity_list_base" resultMap="get-MdmModuleDbEntity-result"
@@ -53,6 +55,7 @@
             <if test="sts != null and sts != ''">and sts = #{sts}</if>
             <if test="org_id != null and org_id != ''">and org_id = #{org_id}</if>
             <if test="companyId != null and companyId != ''">and company_id = #{companyId}</if>
+            <if test="mergeRules != null and mergeRules != ''">and merge_rules = #{mergeRules}</if>
             and sts='Y'
         </trim>
         <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
@@ -77,6 +80,7 @@
             <if test="sts != null and sts != ''">and sts = #{sts}</if>
             <if test="org_id != null and org_id != ''">and org_id = #{org_id}</if>
             <if test="companyId != null and companyId != ''">and company_id = #{companyId}</if>
+            <if test="mergeRules != null and mergeRules != ''">and merge_rules = #{mergeRules}</if>
             and sts='Y'
         </trim>
         <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
@@ -107,6 +111,7 @@
             <if test="sts != null and sts != ''">and sts like concat('%',#{sts},'%')</if>
             <if test="org_id != null and org_id != ''">and org_id like concat('%',#{org_id},'%')</if>
             <if test="companyId != null and companyId != ''">and company_id like concat('%',#{companyId},'%')</if>
+            <if test="mergeRules != null and mergeRules != ''">and merge_rules like concat('%',#{mergeRules},'%')</if>
             and sts='Y'
         </trim>
         <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
@@ -133,6 +138,7 @@
             <if test="sts != null and sts != ''">or sts = #{sts}</if>
             <if test="org_id != null and org_id != ''">or org_id = #{org_id}</if>
             <if test="companyId != null and companyId != ''">or company_id = #{companyId}</if>
+            <if test="mergeRules != null and mergeRules != ''">or merge_rules = #{mergeRules}</if>
             and sts='Y'
         </trim>
         <if test=" sort == null or sort == ''.toString()  ">order by sorts asc</if>
@@ -156,6 +162,7 @@
             <if test="sts != null and sts != ''">sts ,</if>
             <if test="org_id != null and org_id != ''">org_id ,</if>
             <if test="companyId != null and companyId != ''">company_id ,</if>
+            <if test="mergeRules != null and mergeRules != ''">merge_rules ,</if>
             <if test="sts == null ">sts,</if>
         </trim>
         )values(
@@ -173,6 +180,7 @@
             <if test="sts != null and sts != ''">#{sts} ,</if>
             <if test="org_id != null and org_id != ''">#{org_id} ,</if>
             <if test="companyId != null and companyId != ''">#{companyId} ,</if>
+            <if test="mergeRules != null and mergeRules != ''">#{mergeRules} ,</if>
             <if test="sts == null ">'Y',</if>
         </trim>
         )
@@ -180,10 +188,10 @@
     <!-- 批量新增 -->
     <insert id="entityInsertBatch">
         insert into mdm_module_db(mdm_id, db_name, db_type, remark, create_user_id, create_time, modify_user_id,
-        modify_time, sts, org_id, company_id, sts)
+        modify_time, sts, org_id, company_id, merge_rules, sts)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.mdmId},#{entity.dbName},#{entity.dbType},#{entity.remark},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},
+            (#{entity.mdmId},#{entity.dbName},#{entity.dbType},#{entity.remark},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},#{entity.mergeRules},
             'Y')
         </foreach>
     </insert>
@@ -223,6 +231,7 @@
             <if test="sts != null and sts != ''">sts = #{sts},</if>
             <if test="org_id != null and org_id != ''">org_id = #{org_id},</if>
             <if test="companyId != null and companyId != ''">company_id = #{companyId},</if>
+            <if test="mergeRules != null and mergeRules != ''">merge_rules = #{mergeRules},</if>
         </trim>
         where id = #{id}
     </update>
@@ -244,6 +253,7 @@ where id = #{id}
             <if test="sorts != null">and sorts = #{sorts}</if>
             <if test="sts != null and sts != ''">and sts = #{sts}</if>
             <if test="companyId != null and companyId != ''">and company_id = #{companyId}</if>
+            <if test="mergeRules != null and mergeRules != ''">and merge_rules = #{mergeRules}</if>
             and sts='Y'
         </trim>
     </update>