From 4129d738dfb48a6db037490dcbccc15092e5da74 Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Thu, 1 Aug 2024 08:50:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=BB=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=A0=91=E5=BD=A2=E7=BB=93=E6=9E=84=E4=B8=8A=E7=BA=A7?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=EF=BC=8C=E5=BC=95=E7=94=A8=E8=A1=A8=E5=8F=AA?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E4=B8=8A=E7=BA=A7i?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugin/MdmModulePluginInitializer.java    |   2 +-
 .../com/hzya/frame/mdm/entity/MdmDataDto.java |   9 +
 .../mdm/mdmModule/dao/IMdmModuleDao.java      |   2 +
 .../mdmModule/dao/impl/MdmModuleDaoImpl.java  |   7 +-
 .../mdm/mdmModule/entity/MdmModuleEntity.xml  |  23 +-
 .../dao/IMdmModuleDbFiledsRuleDao.java        |   7 +-
 .../impl/MdmModuleDbFiledsRuleDaoImpl.java    |  10 +
 .../entity/MdmModuleDbFiledsRuleEntity.xml    | 559 ++++++++++--------
 .../mdm/service/impl/MdmServiceImpl.java      |  99 ++++
 9 files changed, 455 insertions(+), 263 deletions(-)

diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
index 3657beac..36c5ee81 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
@@ -473,7 +473,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
                     //查询主数据
                     MdmModuleEntity queryMdmModuleEntity = new MdmModuleEntity();
                     queryMdmModuleEntity.setSts("Y");
-                    queryMdmModuleEntity.setMdmCode(10004L);
+                    queryMdmModuleEntity.setMdmCode(10021L);
                     List<MdmModuleEntity> mdmModuleEntities = mdmModuleDao.queryBase(queryMdmModuleEntity);
                     if(mdmModuleEntities == null || mdmModuleEntities.size() == 0){
                         return BaseResult.getSuccessMessageEntity("主数据未设置，不需要下发");
diff --git a/service/src/main/java/com/hzya/frame/mdm/entity/MdmDataDto.java b/service/src/main/java/com/hzya/frame/mdm/entity/MdmDataDto.java
index 0370431c..34db1f03 100644
--- a/service/src/main/java/com/hzya/frame/mdm/entity/MdmDataDto.java
+++ b/service/src/main/java/com/hzya/frame/mdm/entity/MdmDataDto.java
@@ -7,6 +7,7 @@ import java.util.List;
 
 public class MdmDataDto {
 
+    private String mdmId;
     private String id;
     private String tableName;
     private String documentRule;
@@ -65,5 +66,13 @@ public class MdmDataDto {
     public void setDbType(String dbType) {
         this.dbType = dbType;
     }
+
+    public String getMdmId() {
+        return mdmId;
+    }
+
+    public void setMdmId(String mdmId) {
+        this.mdmId = mdmId;
+    }
 }
 
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java
index 9a3aca15..9d683008 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java
@@ -64,5 +64,7 @@ public interface IMdmModuleDao extends IBaseDao<MdmModuleEntity, String> {
      * @return java.util.List<java.lang.Object>
      **/
     List<String> queryMdMFields(Map<String, Object> maps);
+
+    void updataTreeUpData(Map<String, String> updateMaps);
 }
 
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java
index 234d5dad..750b0824 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java
@@ -162,7 +162,7 @@ public class MdmModuleDaoImpl extends MybatisGenericDao<MdmModuleEntity, String>
     }
     @Override
     public List<JSONObject> queryMdmSTs(Map<String, Object> maps) {
-        List<JSONObject> o = (List<JSONObject>) super.selectList(getSqlIdPrifx() + "queryMdmST", maps);
+        List<JSONObject> o = (List<JSONObject>) super.selectList(getSqlIdPrifx() + "queryMdmSTs", maps);
         return o;
     }
 
@@ -171,6 +171,11 @@ public class MdmModuleDaoImpl extends MybatisGenericDao<MdmModuleEntity, String>
         super.update(getSqlIdPrifx() + "updateMdmSTs", maps);
     }
 
+    @Override
+    public void updataTreeUpData(Map<String, String> maps) {
+        super.update(getSqlIdPrifx() + "updataTreeUpData", maps);
+    }
+
     @Override
     public List<String> queryMdMFields(Map<String, Object> maps) {
         List<String> o = (List<String>) super.selectList(getSqlIdPrifx() + "queryMdMFields", maps);
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml
index 63dfa9c2..e7ea39a9 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml
@@ -397,6 +397,9 @@ where id = #{id}
                 `company_id` varchar(50) DEFAULT NULL COMMENT '公司id',
                 `data_type` varchar(50) DEFAULT NULL COMMENT '状态 1、成功2、失败',
                 `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+                `distribute_id` varchar(50) DEFAULT NULL COMMENT 'distribute_id',
+                `api_id` varchar(50) DEFAULT NULL COMMENT 'apiid',
+                `app_id` varchar(50) DEFAULT NULL COMMENT 'app_id',
             </when>
         </choose>
         PRIMARY KEY (`sorts`,`id`) USING BTREE
@@ -933,7 +936,7 @@ where id = #{id}
         WHERE table_name = #{tableName}
     </select>
     <!-- 分页查询列表 采用like格式 -->
-    <select id="queryMdmST" resultType="com.alibaba.fastjson.JSONObject"  parameterType="java.util.HashMap">
+    <select id="queryMdmSTs" resultType="com.alibaba.fastjson.JSONObject"  parameterType="java.util.HashMap">
         select
 
         <if test="field != null and field.size>0">
@@ -1005,9 +1008,9 @@ where id = #{id}
                 </foreach>
             </if>
             and sts = 'Y'
+            order by sorts asc
             <if test="size != null and size !='' ">limit #{size}</if>
         </trim>
-        order by sorts asc
     </select>
 
     <!-- 分页查询列表 采用like格式 -->
@@ -1030,6 +1033,8 @@ where id = #{id}
         update ${tableName} set
         <trim prefixOverrides=",">
             <if test="addStatus != null and addStatus !='' ">, add_status = #{addStatus}</if>
+            <if test="updateStatus != null and updateStatus !='' ">, update_status = #{updateStatus}</if>
+            <if test="deleteStatus != null and deleteStatus !='' ">, delete_status = #{deleteStatus}</if>
             ,modify_time = now()
         </trim>
         <trim prefix="where" prefixOverrides="and">
@@ -1037,5 +1042,19 @@ where id = #{id}
             <if test="dataStatus != null and dataStatus !='' ">and data_status = #{dataStatus}</if>
         </trim>
     </update>
+
+
+    <update id="updataTreeUpData" parameterType="java.util.HashMap">
+        UPDATE ${tableName}
+        SET ${upFiled} = CONCAT(#{newData},SUBSTRING_INDEX( ${upFiled}, #{oldData},- 1 )),
+        modify_time = now(),
+        modify_user_id = #{modify_user_id},
+        data_status = 'F',
+        update_status = '0'
+        WHERE
+        ${upFiled} LIKE  concat(#{oldData},'%')
+        AND sts = 'Y'
+        AND data_status != 'N'
+    </update>
 </mapper>
 
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/dao/IMdmModuleDbFiledsRuleDao.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/dao/IMdmModuleDbFiledsRuleDao.java
index ab7def4b..b63f4881 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/dao/IMdmModuleDbFiledsRuleDao.java
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/dao/IMdmModuleDbFiledsRuleDao.java
@@ -1,7 +1,10 @@
 package com.hzya.frame.mdm.mdmModuleDbFiledsRule.dao;
 
 import com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity;
-import com.hzya.frame.basedao.dao.IBaseDao; 
+import com.hzya.frame.basedao.dao.IBaseDao;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 模版数据库字段规则表(mdm_module_db_fileds_rule: table)表数据库访问层
@@ -12,5 +15,7 @@ import com.hzya.frame.basedao.dao.IBaseDao;
 public interface IMdmModuleDbFiledsRuleDao extends IBaseDao<MdmModuleDbFiledsRuleEntity, String> {
 
     Integer queryUserMdm(MdmModuleDbFiledsRuleEntity queryCount);
+
+    List<MdmModuleDbFiledsRuleEntity> queryServiceQuote(Map<String, String> maps);
 }
 
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/dao/impl/MdmModuleDbFiledsRuleDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/dao/impl/MdmModuleDbFiledsRuleDaoImpl.java
index 2f11bed8..b1390ab1 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/dao/impl/MdmModuleDbFiledsRuleDaoImpl.java
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/dao/impl/MdmModuleDbFiledsRuleDaoImpl.java
@@ -4,6 +4,10 @@ import com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEnti
 import com.hzya.frame.mdm.mdmModuleDbFiledsRule.dao.IMdmModuleDbFiledsRuleDao;
 import org.springframework.stereotype.Repository;
 import com.hzya.frame.basedao.dao.MybatisGenericDao;
+
+import java.util.List;
+import java.util.Map;
+
 /**
  * 模版数据库字段规则表(MdmModuleDbFiledsRule)表数据库访问层
  *
@@ -18,5 +22,11 @@ public class MdmModuleDbFiledsRuleDaoImpl extends MybatisGenericDao<MdmModuleDbF
         Integer o = (Integer) super.selectOne(getSqlIdPrifx() + "queryUserMdm", queryCount);
         return o;
     }
+
+    @Override
+    public List<MdmModuleDbFiledsRuleEntity> queryServiceQuote(Map<String, String> maps) {
+        List<MdmModuleDbFiledsRuleEntity> o = (List<MdmModuleDbFiledsRuleEntity>) super.selectList(getSqlIdPrifx() + "queryServiceQuote", maps);
+        return o;
+    }
 }
 
diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/entity/MdmModuleDbFiledsRuleEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/entity/MdmModuleDbFiledsRuleEntity.xml
index 2c2213f8..30f2c620 100644
--- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/entity/MdmModuleDbFiledsRuleEntity.xml
+++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/entity/MdmModuleDbFiledsRuleEntity.xml
@@ -2,27 +2,28 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hzya.frame.mdm.mdmModuleDbFiledsRule.dao.impl.MdmModuleDbFiledsRuleDaoImpl">
 
-    <resultMap id="get-MdmModuleDbFiledsRuleEntity-result" type="com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity" >
-       <result property="id" column="id" jdbcType="VARCHAR"/>
-           <result property="mdmId" column="mdm_id" jdbcType="VARCHAR"/>
-           <result property="formName" column="form_name" jdbcType="VARCHAR"/>
-           <result property="dbId" column="db_id" jdbcType="VARCHAR"/>
-           <result property="filedId" column="filed_id" jdbcType="VARCHAR"/>
-           <result property="ruleName" column="rule_name" jdbcType="VARCHAR"/>
-           <result property="ruleCode" column="rule_code" jdbcType="VARCHAR"/>
-           <result property="ruleValue" column="rule_value" jdbcType="VARCHAR"/>
-           <result property="ruleType" column="rule_type" jdbcType="VARCHAR"/>
-           <result property="sorts" column="sorts" jdbcType="INTEGER"/>
-           <result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
-           <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
-           <result property="modify_user_id" column="modify_user_id" jdbcType="VARCHAR"/>
-           <result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
-           <result property="sts" column="sts" jdbcType="VARCHAR"/>
-           <result property="org_id" column="org_id" jdbcType="VARCHAR"/>
-           <result property="companyId" column="company_id" jdbcType="VARCHAR"/>
-        </resultMap>
+    <resultMap id="get-MdmModuleDbFiledsRuleEntity-result"
+               type="com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="mdmId" column="mdm_id" jdbcType="VARCHAR"/>
+        <result property="formName" column="form_name" jdbcType="VARCHAR"/>
+        <result property="dbId" column="db_id" jdbcType="VARCHAR"/>
+        <result property="filedId" column="filed_id" jdbcType="VARCHAR"/>
+        <result property="ruleName" column="rule_name" jdbcType="VARCHAR"/>
+        <result property="ruleCode" column="rule_code" jdbcType="VARCHAR"/>
+        <result property="ruleValue" column="rule_value" jdbcType="VARCHAR"/>
+        <result property="ruleType" column="rule_type" jdbcType="VARCHAR"/>
+        <result property="sorts" column="sorts" jdbcType="INTEGER"/>
+        <result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
+        <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="modify_user_id" column="modify_user_id" jdbcType="VARCHAR"/>
+        <result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
+        <result property="sts" column="sts" jdbcType="VARCHAR"/>
+        <result property="org_id" column="org_id" jdbcType="VARCHAR"/>
+        <result property="companyId" column="company_id" jdbcType="VARCHAR"/>
+    </resultMap>
     <!-- 查询的字段-->
-    <sql id = "MdmModuleDbFiledsRuleEntity_Base_Column_List">
+    <sql id="MdmModuleDbFiledsRuleEntity_Base_Column_List">
         id
        ,mdm_id 
         ,form_name 
@@ -39,261 +40,303 @@
         ,modify_time 
         ,sts 
         ,org_id 
-        ,company_id 
-     </sql>
- <!-- 查询 采用==查询 -->
- <select id="entity_list_base" resultMap="get-MdmModuleDbFiledsRuleEntity-result" parameterType = "com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity">
-    select
-    <include refid="MdmModuleDbFiledsRuleEntity_Base_Column_List" />
-    from mdm_module_db_fileds_rule
-    <trim prefix="where" prefixOverrides="and"> 
-        <if test="id != null and id != ''"> and id = #{id} </if>
-            <if test="mdmId != null and mdmId != ''"> and mdm_id = #{mdmId} </if>
-            <if test="formName != null and formName != ''"> and form_name = #{formName} </if>
-            <if test="dbId != null and dbId != ''"> and db_id = #{dbId} </if>
-            <if test="filedId != null and filedId != ''"> and filed_id = #{filedId} </if>
-            <if test="ruleName != null and ruleName != ''"> and rule_name = #{ruleName} </if>
-            <if test="ruleCode != null and ruleCode != ''"> and rule_code = #{ruleCode} </if>
-            <if test="ruleValue != null and ruleValue != ''"> and rule_value = #{ruleValue} </if>
-            <if test="ruleType != null and ruleType != ''"> and rule_type = #{ruleType} </if>
-            <if test="sorts != null"> and sorts = #{sorts} </if>
-            <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
-            <if test="create_time != null"> and create_time = #{create_time} </if>
-            <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
-            <if test="modify_time != null"> and modify_time = #{modify_time} </if>
-            <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>
+        ,company_id
+    </sql>
+    <!-- 查询 采用==查询 -->
+    <select id="entity_list_base" resultMap="get-MdmModuleDbFiledsRuleEntity-result"
+            parameterType="com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity">
+        select
+        <include refid="MdmModuleDbFiledsRuleEntity_Base_Column_List"/>
+        from mdm_module_db_fileds_rule
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="mdmId != null and mdmId != ''">and mdm_id = #{mdmId}</if>
+            <if test="formName != null and formName != ''">and form_name = #{formName}</if>
+            <if test="dbId != null and dbId != ''">and db_id = #{dbId}</if>
+            <if test="filedId != null and filedId != ''">and filed_id = #{filedId}</if>
+            <if test="ruleName != null and ruleName != ''">and rule_name = #{ruleName}</if>
+            <if test="ruleCode != null and ruleCode != ''">and rule_code = #{ruleCode}</if>
+            <if test="ruleValue != null and ruleValue != ''">and rule_value = #{ruleValue}</if>
+            <if test="ruleType != null and ruleType != ''">and rule_type = #{ruleType}</if>
+            <if test="sorts != null">and sorts = #{sorts}</if>
+            <if test="create_user_id != null and create_user_id != ''">and create_user_id = #{create_user_id}</if>
+            <if test="create_time != null">and create_time = #{create_time}</if>
+            <if test="modify_user_id != null and modify_user_id != ''">and modify_user_id = #{modify_user_id}</if>
+            <if test="modify_time != null">and modify_time = #{modify_time}</if>
+            <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>
             and sts='Y'
-    </trim>
-    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
-    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
-</select>
-    
-<!-- 查询符合条件的数量 -->
-<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity">
-        select  count(1)   from mdm_module_db_fileds_rule
-    <trim prefix="where" prefixOverrides="and"> 
-        <if test="id != null and id != ''"> and id = #{id} </if>
-            <if test="mdmId != null and mdmId != ''"> and mdm_id = #{mdmId} </if>
-            <if test="formName != null and formName != ''"> and form_name = #{formName} </if>
-            <if test="dbId != null and dbId != ''"> and db_id = #{dbId} </if>
-            <if test="filedId != null and filedId != ''"> and filed_id = #{filedId} </if>
-            <if test="ruleName != null and ruleName != ''"> and rule_name = #{ruleName} </if>
-            <if test="ruleCode != null and ruleCode != ''"> and rule_code = #{ruleCode} </if>
-            <if test="ruleValue != null and ruleValue != ''"> and rule_value = #{ruleValue} </if>
-            <if test="ruleType != null and ruleType != ''"> and rule_type = #{ruleType} </if>
-            <if test="sorts != null"> and sorts = #{sorts} </if>
-            <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
-            <if test="create_time != null"> and create_time = #{create_time} </if>
-            <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
-            <if test="modify_time != null"> and modify_time = #{modify_time} </if>
-            <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>
+        </trim>
+        <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
+        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+    </select>
+
+    <!-- 查询符合条件的数量 -->
+    <select id="entity_count" resultType="Integer"
+            parameterType="com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity">
+        select count(1) from mdm_module_db_fileds_rule
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="mdmId != null and mdmId != ''">and mdm_id = #{mdmId}</if>
+            <if test="formName != null and formName != ''">and form_name = #{formName}</if>
+            <if test="dbId != null and dbId != ''">and db_id = #{dbId}</if>
+            <if test="filedId != null and filedId != ''">and filed_id = #{filedId}</if>
+            <if test="ruleName != null and ruleName != ''">and rule_name = #{ruleName}</if>
+            <if test="ruleCode != null and ruleCode != ''">and rule_code = #{ruleCode}</if>
+            <if test="ruleValue != null and ruleValue != ''">and rule_value = #{ruleValue}</if>
+            <if test="ruleType != null and ruleType != ''">and rule_type = #{ruleType}</if>
+            <if test="sorts != null">and sorts = #{sorts}</if>
+            <if test="create_user_id != null and create_user_id != ''">and create_user_id = #{create_user_id}</if>
+            <if test="create_time != null">and create_time = #{create_time}</if>
+            <if test="modify_user_id != null and modify_user_id != ''">and modify_user_id = #{modify_user_id}</if>
+            <if test="modify_time != null">and modify_time = #{modify_time}</if>
+            <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>
             and sts='Y'
-    </trim>
-    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
-    <if test=" sort !='' and sort!=null and order !='' and order!=null "> order by ${sort} ${order}</if>
+        </trim>
+        <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
+        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
     </select>
 
     <!-- 分页查询列表 采用like格式 -->
-<select id="entity_list_like" resultMap="get-MdmModuleDbFiledsRuleEntity-result" parameterType = "com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity">
-    select
-    <include refid="MdmModuleDbFiledsRuleEntity_Base_Column_List" />
-    from mdm_module_db_fileds_rule
-    <trim prefix="where" prefixOverrides="and"> 
-        <if test="id != null and id != ''"> and id like concat('%',#{id},'%') </if>
-            <if test="mdmId != null and mdmId != ''"> and mdm_id like concat('%',#{mdmId},'%') </if>
-            <if test="formName != null and formName != ''"> and form_name like concat('%',#{formName},'%') </if>
-            <if test="dbId != null and dbId != ''"> and db_id like concat('%',#{dbId},'%') </if>
-            <if test="filedId != null and filedId != ''"> and filed_id like concat('%',#{filedId},'%') </if>
-            <if test="ruleName != null and ruleName != ''"> and rule_name like concat('%',#{ruleName},'%') </if>
-            <if test="ruleCode != null and ruleCode != ''"> and rule_code like concat('%',#{ruleCode},'%') </if>
-            <if test="ruleValue != null and ruleValue != ''"> and rule_value like concat('%',#{ruleValue},'%') </if>
-            <if test="ruleType != null and ruleType != ''"> and rule_type like concat('%',#{ruleType},'%') </if>
-            <if test="sorts != null"> and sorts like concat('%',#{sorts},'%') </if>
-            <if test="create_user_id != null and create_user_id != ''"> and create_user_id like concat('%',#{create_user_id},'%') </if>
-            <if test="create_time != null"> and create_time like concat('%',#{create_time},'%') </if>
-            <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id like concat('%',#{modify_user_id},'%') </if>
-            <if test="modify_time != null"> and modify_time like concat('%',#{modify_time},'%') </if>
-            <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>
+    <select id="entity_list_like" resultMap="get-MdmModuleDbFiledsRuleEntity-result"
+            parameterType="com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity">
+        select
+        <include refid="MdmModuleDbFiledsRuleEntity_Base_Column_List"/>
+        from mdm_module_db_fileds_rule
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">and id like concat('%',#{id},'%')</if>
+            <if test="mdmId != null and mdmId != ''">and mdm_id like concat('%',#{mdmId},'%')</if>
+            <if test="formName != null and formName != ''">and form_name like concat('%',#{formName},'%')</if>
+            <if test="dbId != null and dbId != ''">and db_id like concat('%',#{dbId},'%')</if>
+            <if test="filedId != null and filedId != ''">and filed_id like concat('%',#{filedId},'%')</if>
+            <if test="ruleName != null and ruleName != ''">and rule_name like concat('%',#{ruleName},'%')</if>
+            <if test="ruleCode != null and ruleCode != ''">and rule_code like concat('%',#{ruleCode},'%')</if>
+            <if test="ruleValue != null and ruleValue != ''">and rule_value like concat('%',#{ruleValue},'%')</if>
+            <if test="ruleType != null and ruleType != ''">and rule_type like concat('%',#{ruleType},'%')</if>
+            <if test="sorts != null">and sorts like concat('%',#{sorts},'%')</if>
+            <if test="create_user_id != null and create_user_id != ''">and create_user_id like
+                concat('%',#{create_user_id},'%')
+            </if>
+            <if test="create_time != null">and create_time like concat('%',#{create_time},'%')</if>
+            <if test="modify_user_id != null and modify_user_id != ''">and modify_user_id like
+                concat('%',#{modify_user_id},'%')
+            </if>
+            <if test="modify_time != null">and modify_time like concat('%',#{modify_time},'%')</if>
+            <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>
             and sts='Y'
-    </trim>
-    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
-    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
-</select>
+        </trim>
+        <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
+        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+    </select>
 
-<!-- 查询列表 字段采用or格式 -->
-<select id="MdmModuleDbFiledsRuleentity_list_or" resultMap="get-MdmModuleDbFiledsRuleEntity-result" parameterType = "com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity">
-    select
-    <include refid="MdmModuleDbFiledsRuleEntity_Base_Column_List" />
-    from mdm_module_db_fileds_rule
-    <trim prefix="where" prefixOverrides="and"> 
-         <if test="id != null and id != ''"> or id = #{id} </if>
-             <if test="mdmId != null and mdmId != ''"> or mdm_id = #{mdmId} </if>
-             <if test="formName != null and formName != ''"> or form_name = #{formName} </if>
-             <if test="dbId != null and dbId != ''"> or db_id = #{dbId} </if>
-             <if test="filedId != null and filedId != ''"> or filed_id = #{filedId} </if>
-             <if test="ruleName != null and ruleName != ''"> or rule_name = #{ruleName} </if>
-             <if test="ruleCode != null and ruleCode != ''"> or rule_code = #{ruleCode} </if>
-             <if test="ruleValue != null and ruleValue != ''"> or rule_value = #{ruleValue} </if>
-             <if test="ruleType != null and ruleType != ''"> or rule_type = #{ruleType} </if>
-             <if test="sorts != null"> or sorts = #{sorts} </if>
-             <if test="create_user_id != null and create_user_id != ''"> or create_user_id = #{create_user_id} </if>
-              <if test="create_time != null"> or create_time = #{create_time} </if>
-              <if test="modify_user_id != null and modify_user_id != ''"> or modify_user_id = #{modify_user_id} </if>
-              <if test="modify_time != null"> or modify_time = #{modify_time} </if>
-              <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>
+    <!-- 查询列表 字段采用or格式 -->
+    <select id="MdmModuleDbFiledsRuleentity_list_or" resultMap="get-MdmModuleDbFiledsRuleEntity-result"
+            parameterType="com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity">
+        select
+        <include refid="MdmModuleDbFiledsRuleEntity_Base_Column_List"/>
+        from mdm_module_db_fileds_rule
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">or id = #{id}</if>
+            <if test="mdmId != null and mdmId != ''">or mdm_id = #{mdmId}</if>
+            <if test="formName != null and formName != ''">or form_name = #{formName}</if>
+            <if test="dbId != null and dbId != ''">or db_id = #{dbId}</if>
+            <if test="filedId != null and filedId != ''">or filed_id = #{filedId}</if>
+            <if test="ruleName != null and ruleName != ''">or rule_name = #{ruleName}</if>
+            <if test="ruleCode != null and ruleCode != ''">or rule_code = #{ruleCode}</if>
+            <if test="ruleValue != null and ruleValue != ''">or rule_value = #{ruleValue}</if>
+            <if test="ruleType != null and ruleType != ''">or rule_type = #{ruleType}</if>
+            <if test="sorts != null">or sorts = #{sorts}</if>
+            <if test="create_user_id != null and create_user_id != ''">or create_user_id = #{create_user_id}</if>
+            <if test="create_time != null">or create_time = #{create_time}</if>
+            <if test="modify_user_id != null and modify_user_id != ''">or modify_user_id = #{modify_user_id}</if>
+            <if test="modify_time != null">or modify_time = #{modify_time}</if>
+            <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>
             and sts='Y'
-    </trim>
-    <if test=" sort == null or sort == ''.toString()  "> order by sorts asc</if>
-    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
-</select>
+        </trim>
+        <if test=" sort == null or sort == ''.toString()  ">order by sorts asc</if>
+        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+    </select>
 
-<!--新增所有列-->
-<insert id="entity_insert" parameterType = "com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity"  >
-    insert into mdm_module_db_fileds_rule(
-  <trim suffix="" suffixOverrides=",">
-       <if test="id != null and id != ''"> id , </if>
-            <if test="mdmId != null and mdmId != ''"> mdm_id , </if>
-            <if test="formName != null and formName != ''"> form_name , </if>
-            <if test="dbId != null and dbId != ''"> db_id , </if>
-            <if test="filedId != null and filedId != ''"> filed_id , </if>
-            <if test="ruleName != null and ruleName != ''"> rule_name , </if>
-            <if test="ruleCode != null and ruleCode != ''"> rule_code , </if>
-            <if test="ruleValue != null and ruleValue != ''"> rule_value , </if>
-            <if test="ruleType != null and ruleType != ''"> rule_type , </if>
-            <if test="sorts != null"> sorts , </if>
-            <if test="create_user_id != null and create_user_id != ''"> create_user_id , </if>
-            <if test="create_time != null"> create_time , </if>
-            <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id , </if>
-            <if test="modify_time != null"> modify_time , </if>
-            <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="sts == null ">sts,</if>
-  </trim>
-  )values(
- <trim suffix="" suffixOverrides=",">
-       <if test="id != null and id != ''"> #{id} ,</if>
-            <if test="mdmId != null and mdmId != ''"> #{mdmId} ,</if>
-            <if test="formName != null and formName != ''"> #{formName} ,</if>
-            <if test="dbId != null and dbId != ''"> #{dbId} ,</if>
-            <if test="filedId != null and filedId != ''"> #{filedId} ,</if>
-            <if test="ruleName != null and ruleName != ''"> #{ruleName} ,</if>
-            <if test="ruleCode != null and ruleCode != ''"> #{ruleCode} ,</if>
-            <if test="ruleValue != null and ruleValue != ''"> #{ruleValue} ,</if>
-            <if test="ruleType != null and ruleType != ''"> #{ruleType} ,</if>
-            <if test="sorts != null"> #{sorts} ,</if>
-            <if test="create_user_id != null and create_user_id != ''"> #{create_user_id} ,</if>
-            <if test="create_time != null"> #{create_time} ,</if>
-            <if test="modify_user_id != null and modify_user_id != ''"> #{modify_user_id} ,</if>
-            <if test="modify_time != null"> #{modify_time} ,</if>
-            <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="sts == null ">'Y',</if>
-  </trim>
-  )  
-</insert>
-<!-- 批量新增 -->
-<insert id="entityInsertBatch"  >
-  insert into mdm_module_db_fileds_rule(mdm_id, form_name, db_id, filed_id, rule_name, rule_code, rule_value, rule_type, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id,  sts) 
-    values
-    <foreach collection="entities" item="entity" separator=",">
-    (#{entity.mdmId},#{entity.formName},#{entity.dbId},#{entity.filedId},#{entity.ruleName},#{entity.ruleCode},#{entity.ruleValue},#{entity.ruleType},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y')
-    </foreach>
-</insert>
-<!-- 批量新增或者修改-->
-<insert id="entityInsertOrUpdateBatch"  >
-    insert into mdm_module_db_fileds_rule(mdm_id, form_name, db_id, filed_id, rule_name, rule_code, rule_value, rule_type, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id)
-    values
-    <foreach collection="entities" item="entity" separator=",">
-    (#{entity.mdmId},#{entity.formName},#{entity.dbId},#{entity.filedId},#{entity.ruleName},#{entity.ruleCode},#{entity.ruleValue},#{entity.ruleType},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId})
-    </foreach>
-    on duplicate key update
-    mdm_id = values(mdm_id),
-    form_name = values(form_name),
-    db_id = values(db_id),
-    filed_id = values(filed_id),
-    rule_name = values(rule_name),
-    rule_code = values(rule_code),
-    rule_value = values(rule_value),
-    rule_type = values(rule_type),
-    create_user_id = values(create_user_id),
-    create_time = values(create_time),
-    modify_user_id = values(modify_user_id),
-    modify_time = values(modify_time),
-    sts = values(sts),
-    org_id = values(org_id),
-    company_id = values(company_id)</insert>
-<!--通过主键修改方法-->
-<update id="entity_update" parameterType = "com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity" >
-update mdm_module_db_fileds_rule  set
-<trim suffix="" suffixOverrides=",">
-  <if test="mdmId != null and mdmId != ''"> mdm_id = #{mdmId},</if>
-  <if test="formName != null and formName != ''"> form_name = #{formName},</if>
-  <if test="dbId != null and dbId != ''"> db_id = #{dbId},</if>
-  <if test="filedId != null and filedId != ''"> filed_id = #{filedId},</if>
-  <if test="ruleName != null and ruleName != ''"> rule_name = #{ruleName},</if>
-  <if test="ruleCode != null and ruleCode != ''"> rule_code = #{ruleCode},</if>
-  <if test="ruleValue != null and ruleValue != ''"> rule_value = #{ruleValue},</if>
-  <if test="ruleType != null and ruleType != ''"> rule_type = #{ruleType},</if>
-  <if test="create_user_id != null and create_user_id != ''"> create_user_id = #{create_user_id},</if>
-    <if test="create_time != null"> create_time = #{create_time},</if>
-    <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id = #{modify_user_id},</if>
-    <if test="modify_time != null"> modify_time = #{modify_time},</if>
-    <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>
-</trim>
-where id = #{id}
-</update>
-<!-- 逻辑删除 -->
-<update id="entity_logicDelete" parameterType = "com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity" >
-update mdm_module_db_fileds_rule  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
-where id = #{id}
-</update>
-<!-- 多条件逻辑删除 -->
-<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity" >
-update mdm_module_db_fileds_rule  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
- <trim prefix="where" prefixOverrides="and"> 
-        <if test="id != null and id != ''"> and id = #{id} </if>
-            <if test="mdmId != null and mdmId != ''"> and mdm_id = #{mdmId} </if>
-            <if test="formName != null and formName != ''"> and form_name = #{formName} </if>
-            <if test="dbId != null and dbId != ''"> and db_id = #{dbId} </if>
-            <if test="filedId != null and filedId != ''"> and filed_id = #{filedId} </if>
-            <if test="ruleName != null and ruleName != ''"> and rule_name = #{ruleName} </if>
-            <if test="ruleCode != null and ruleCode != ''"> and rule_code = #{ruleCode} </if>
-            <if test="ruleValue != null and ruleValue != ''"> and rule_value = #{ruleValue} </if>
-            <if test="ruleType != null and ruleType != ''"> and rule_type = #{ruleType} </if>
-            <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>
+    <!--新增所有列-->
+    <insert id="entity_insert"
+            parameterType="com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity">
+        insert into mdm_module_db_fileds_rule(
+        <trim suffix="" suffixOverrides=",">
+            <if test="id != null and id != ''">id ,</if>
+            <if test="mdmId != null and mdmId != ''">mdm_id ,</if>
+            <if test="formName != null and formName != ''">form_name ,</if>
+            <if test="dbId != null and dbId != ''">db_id ,</if>
+            <if test="filedId != null and filedId != ''">filed_id ,</if>
+            <if test="ruleName != null and ruleName != ''">rule_name ,</if>
+            <if test="ruleCode != null and ruleCode != ''">rule_code ,</if>
+            <if test="ruleValue != null and ruleValue != ''">rule_value ,</if>
+            <if test="ruleType != null and ruleType != ''">rule_type ,</if>
+            <if test="sorts != null">sorts ,</if>
+            <if test="create_user_id != null and create_user_id != ''">create_user_id ,</if>
+            <if test="create_time != null">create_time ,</if>
+            <if test="modify_user_id != null and modify_user_id != ''">modify_user_id ,</if>
+            <if test="modify_time != null">modify_time ,</if>
+            <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="sts == null ">sts,</if>
+        </trim>
+        )values(
+        <trim suffix="" suffixOverrides=",">
+            <if test="id != null and id != ''">#{id} ,</if>
+            <if test="mdmId != null and mdmId != ''">#{mdmId} ,</if>
+            <if test="formName != null and formName != ''">#{formName} ,</if>
+            <if test="dbId != null and dbId != ''">#{dbId} ,</if>
+            <if test="filedId != null and filedId != ''">#{filedId} ,</if>
+            <if test="ruleName != null and ruleName != ''">#{ruleName} ,</if>
+            <if test="ruleCode != null and ruleCode != ''">#{ruleCode} ,</if>
+            <if test="ruleValue != null and ruleValue != ''">#{ruleValue} ,</if>
+            <if test="ruleType != null and ruleType != ''">#{ruleType} ,</if>
+            <if test="sorts != null">#{sorts} ,</if>
+            <if test="create_user_id != null and create_user_id != ''">#{create_user_id} ,</if>
+            <if test="create_time != null">#{create_time} ,</if>
+            <if test="modify_user_id != null and modify_user_id != ''">#{modify_user_id} ,</if>
+            <if test="modify_time != null">#{modify_time} ,</if>
+            <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="sts == null ">'Y',</if>
+        </trim>
+        )
+    </insert>
+    <!-- 批量新增 -->
+    <insert id="entityInsertBatch">
+        insert into mdm_module_db_fileds_rule(mdm_id, form_name, db_id, filed_id, rule_name, rule_code, rule_value,
+        rule_type, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.mdmId},#{entity.formName},#{entity.dbId},#{entity.filedId},#{entity.ruleName},#{entity.ruleCode},#{entity.ruleValue},#{entity.ruleType},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},
+            'Y')
+        </foreach>
+    </insert>
+    <!-- 批量新增或者修改-->
+    <insert id="entityInsertOrUpdateBatch">
+        insert into mdm_module_db_fileds_rule(mdm_id, form_name, db_id, filed_id, rule_name, rule_code, rule_value,
+        rule_type, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.mdmId},#{entity.formName},#{entity.dbId},#{entity.filedId},#{entity.ruleName},#{entity.ruleCode},#{entity.ruleValue},#{entity.ruleType},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId})
+        </foreach>
+        on duplicate key update
+        mdm_id = values(mdm_id),
+        form_name = values(form_name),
+        db_id = values(db_id),
+        filed_id = values(filed_id),
+        rule_name = values(rule_name),
+        rule_code = values(rule_code),
+        rule_value = values(rule_value),
+        rule_type = values(rule_type),
+        create_user_id = values(create_user_id),
+        create_time = values(create_time),
+        modify_user_id = values(modify_user_id),
+        modify_time = values(modify_time),
+        sts = values(sts),
+        org_id = values(org_id),
+        company_id = values(company_id)
+    </insert>
+    <!--通过主键修改方法-->
+    <update id="entity_update"
+            parameterType="com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity">
+        update mdm_module_db_fileds_rule set
+        <trim suffix="" suffixOverrides=",">
+            <if test="mdmId != null and mdmId != ''">mdm_id = #{mdmId},</if>
+            <if test="formName != null and formName != ''">form_name = #{formName},</if>
+            <if test="dbId != null and dbId != ''">db_id = #{dbId},</if>
+            <if test="filedId != null and filedId != ''">filed_id = #{filedId},</if>
+            <if test="ruleName != null and ruleName != ''">rule_name = #{ruleName},</if>
+            <if test="ruleCode != null and ruleCode != ''">rule_code = #{ruleCode},</if>
+            <if test="ruleValue != null and ruleValue != ''">rule_value = #{ruleValue},</if>
+            <if test="ruleType != null and ruleType != ''">rule_type = #{ruleType},</if>
+            <if test="create_user_id != null and create_user_id != ''">create_user_id = #{create_user_id},</if>
+            <if test="create_time != null">create_time = #{create_time},</if>
+            <if test="modify_user_id != null and modify_user_id != ''">modify_user_id = #{modify_user_id},</if>
+            <if test="modify_time != null">modify_time = #{modify_time},</if>
+            <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>
+        </trim>
+        where id = #{id}
+    </update>
+    <!-- 逻辑删除 -->
+    <update id="entity_logicDelete"
+            parameterType="com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity">
+        update mdm_module_db_fileds_rule
+        set sts= 'N',
+            modify_time = #{modify_time},
+            modify_user_id = #{modify_user_id}
+        where id = #{id}
+    </update>
+    <!-- 多条件逻辑删除 -->
+    <update id="entity_logicDelete_Multi_Condition"
+            parameterType="com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity">
+        update mdm_module_db_fileds_rule set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="mdmId != null and mdmId != ''">and mdm_id = #{mdmId}</if>
+            <if test="formName != null and formName != ''">and form_name = #{formName}</if>
+            <if test="dbId != null and dbId != ''">and db_id = #{dbId}</if>
+            <if test="filedId != null and filedId != ''">and filed_id = #{filedId}</if>
+            <if test="ruleName != null and ruleName != ''">and rule_name = #{ruleName}</if>
+            <if test="ruleCode != null and ruleCode != ''">and rule_code = #{ruleCode}</if>
+            <if test="ruleValue != null and ruleValue != ''">and rule_value = #{ruleValue}</if>
+            <if test="ruleType != null and ruleType != ''">and rule_type = #{ruleType}</if>
+            <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>
             and sts='Y'
-    </trim>
-</update>
-<!--通过主键删除-->
-<delete id="entity_delete">
-    delete from mdm_module_db_fileds_rule where id = #{id}
-</delete>
+        </trim>
+    </update>
+    <!--通过主键删除-->
+    <delete id="entity_delete">
+        delete
+        from mdm_module_db_fileds_rule
+        where id = #{id}
+    </delete>
 
     <!-- 查询符合条件的数量 -->
-    <select id="queryUserMdm" resultType="Integer" parameterType = "com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity">
-        select  count(1)   from mdm_module_db_fileds_rule
+    <select id="queryUserMdm" resultType="Integer"
+            parameterType="com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity">
+        select count(1) from mdm_module_db_fileds_rule
         <trim prefix="where" prefixOverrides="and">
-            <if test="mdmId != null and mdmId != ''"> and mdm_id != #{mdmId} </if>
-            <if test="ruleCode != null and ruleCode != ''"> and rule_code = #{ruleCode} </if>
-            <if test="ruleValue != null and ruleValue != ''"> and rule_value = #{ruleValue} </if>
+            <if test="mdmId != null and mdmId != ''">and mdm_id != #{mdmId}</if>
+            <if test="ruleCode != null and ruleCode != ''">and rule_code = #{ruleCode}</if>
+            <if test="ruleValue != null and ruleValue != ''">and rule_value = #{ruleValue}</if>
             and sts='Y'
         </trim>
     </select>
+    <!-- 查询列表 字段采用or格式 -->
+    <select id="queryServiceQuote" resultMap="get-MdmModuleDbFiledsRuleEntity-result">
 
+        SELECT filed_id,
+               db_id,
+               mdm_id
+        from (
+                 SELECT filed_id,
+                        db_id,
+                        mdm_id,
+                        COUNT(*) as num
+                 FROM mdm_module_db_fileds_rule
+                 WHERE `sts` = 'Y'
+                   and (
+                         (rule_code = 'type' and rule_value = 'treeselect')
+                         or (rule_code = 'service' and rule_value =  #{service})
+                         or (rule_code = 'upId' and rule_value = #{upId})
+                     )
+                 GROUP BY filed_id, db_id, mdm_id) a
+        WHERE a.num = 3
+    </select>
 
 </mapper>
 
diff --git a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
index b1ad3001..d3a6b263 100644
--- a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
@@ -2537,6 +2537,7 @@ public class MdmServiceImpl implements IMdmService {
                     JSONObject jsonObject = saveData.getJSONObject(mdmModuleDbEntityList.get(i).getDbName());
                     //保存数据
                     MdmDataDto mdmDataDto = new MdmDataDto();
+                    mdmDataDto.setMdmId(mdmModuleEntity.getId());
                     mdmDataDto.setTableName(mdmModuleDbEntityList.get(i).getDbName());
                     MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity1 = new MdmModuleDbFiledsEntity();
                     mdmModuleDbFiledsEntity1.setMdmId(mdmModuleEntity.getId());
@@ -2610,7 +2611,104 @@ public class MdmServiceImpl implements IMdmService {
                     if (flag) {
                         mdmDataDto.setId(jsonObject.getString("id"));
                         id = jsonObject.getString("id");
+                        boolean asdasd = false;
+                        if(asdasd){
+                            //查询是否设置的树形
+                            MdmModuleViewEntity mdmModuleViewEntity = new MdmModuleViewEntity();
+                            mdmModuleViewEntity.setMdmId(mdmModuleEntity.getId());
+                            mdmModuleViewEntity.setViewName("1");
+                            mdmModuleViewEntity.setSts("Y");
+                            List<MdmModuleViewEntity> moduleViewEntityList = mdmModuleViewDao.queryBase(mdmModuleViewEntity);
+                            if (moduleViewEntityList != null && moduleViewEntityList.size() == 1) {
+                                mdmModuleViewEntity = moduleViewEntityList.get(0);
+                                //查询数据
+                                Map<String, Object> queryData = new HashMap<>();
+                                queryData.put("tableName", mdmDataDto.getTableName());//表名
+                                queryData.put("detailFlag", false);//是否明细
+                                queryData.put("id", id);//字段
+                                HashMap<String, Object> datas = mdmModuleDbDao.getServiceDataById(queryData);
+                                convertKeysToLowerCase(datas);
+                                //对比值是否有修改
+                                boolean upFlag = false;
+                                String oldData = "";
 
+                                String newData = "";
+
+                                for (int i1 = 0; i1 < mdmDataFiledDtos.size(); i1++) {
+                                    if (mdmDataFiledDtos.get(i1).getFiledsName().equals(mdmModuleViewEntity.getUpIdFiled())) {
+                                        newData = mdmDataFiledDtos.get(i1).getFiledsValue();
+                                        oldData = datas.get(mdmDataFiledDtos.get(i1).getFiledsName()).toString();
+
+                                        if (mdmDataFiledDtos.get(i1).getFiledsValue().equals(datas.get(mdmDataFiledDtos.get(i1).getFiledsName()).toString())) {
+                                            upFlag = true;
+                                            break;
+                                        }
+                                    }
+                                }
+                                if (upFlag) {
+                                    //查询引用地方
+                                    Map<String, String> maps = new HashMap<>();
+                                    maps.put("service",mdmDataDto.getTableName());
+                                    maps.put("upId",mdmModuleViewEntity.getUpIdFiled());
+                                    //maps.put("mdmId",mdmModuleEntity.getId());
+                                    List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRuleEntities = mdmModuleDbFiledsRuleDao.queryServiceQuote(maps);
+                                    if(mdmModuleDbFiledsRuleEntities != null && mdmModuleDbFiledsRuleEntities.size() > 0){
+                                        for (int i1 = 0; i1 < mdmModuleDbFiledsRuleEntities.size(); i1++) {
+                                            //查询字段
+                                            String upFiled = "";
+
+                                            MdmModuleDbFiledsEntity moduleDbFiledsEntity = new MdmModuleDbFiledsEntity();
+                                            moduleDbFiledsEntity.setMdmId(mdmModuleDbFiledsRuleEntities.get(i1).getMdmId());
+                                            moduleDbFiledsEntity.setSts("Y");
+                                            List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntities = mdmServiceCache.queryMdmModuleDbFileds(moduleDbFiledsEntity);
+                                            if(mdmModuleDbFiledsEntities != null && mdmModuleDbFiledsEntities.size() > 0){
+                                                for (int i2 = 0; i2 < mdmModuleDbFiledsEntities.size(); i2++) {
+                                                    if(mdmModuleDbFiledsRuleEntities.get(i1).getFiledId().equals(mdmModuleDbFiledsEntities.get(i2).getId())){
+                                                        upFiled = mdmModuleDbFiledsEntities.get(i2).getEnName();
+                                                    }
+                                                }
+                                            }
+                                            //修改引用数据
+                                            //查看是否主表
+                                            MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
+                                            mdmModuleDbEntity.setMdmId(mdmModuleDbFiledsRuleEntities.get(i1).getMdmId());
+                                            mdmModuleDbEntity.setSts("Y");
+                                            List<MdmModuleDbEntity> mdmModuleDbEntities = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity);
+                                            //设置主表
+                                            String mainDBTable = "";
+                                            String dataDBTable = "";
+                                            if(mdmModuleDbEntities != null && mdmModuleDbEntities.size() > 0){
+                                                for (int i2 = 0; i2 < mdmModuleDbEntities.size(); i2++) {
+                                                    //主表
+                                                    if("1".equals(mdmModuleDbEntities.get(i2).getDbType())){
+                                                        mainDBTable = mdmModuleDbEntities.get(i2).getDbName();
+                                                    }
+                                                    if(mdmModuleDbFiledsRuleEntities.get(i1).getDbId().equals(mdmModuleDbEntities.get(i2).getId())){
+                                                        dataDBTable = mdmModuleDbEntities.get(i2).getDbName();
+                                                    }
+                                                }
+                                            }
+
+                                            if(mainDBTable.equals(dataDBTable)){//主表上的字段
+                                                Map<String, String> updateMaps = new HashMap<>();
+                                                updateMaps.put("tableName",dataDBTable);
+                                                updateMaps.put("upFiled",upFiled);
+                                                updateMaps.put("oldData",oldData);
+                                                updateMaps.put("newData",newData);
+                                                updateMaps.put("modify_user_id",StpUtil.getLoginIdAsString());
+                                                mdmModuleDao.updataTreeUpData(updateMaps);
+                                            }else {//明细表上的字段
+
+
+
+                                            }
+
+                                        }
+                                    }
+                                }
+
+                            }
+                        }
                         int a = mdmModuleDao.updateForm(mdmDataDto);
                     } else {
 
@@ -2762,6 +2860,7 @@ public class MdmServiceImpl implements IMdmService {
                             mdmDataDto.setMdmDataFiledDtos(mdmDataFiledDtos);
                             if (jsonObject.getString("id") != null) {
                                 mdmDataDto.setId(jsonObject.getString("id"));
+
                                 int a = mdmModuleDao.updateForm(mdmDataDto);
                             } else {
                                 mdmDataDto.setDbType(mdmModuleDbEntityList.get(i).getDbType());

From 99897ddbb295f5bfef4d6b013dd045fe6c460bd0 Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Thu, 1 Aug 2024 08:51:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=BB=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=A0=91=E5=BD=A2=E7=BB=93=E6=9E=84=E4=B8=8A=E7=BA=A7?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=EF=BC=8C=E5=BC=95=E7=94=A8=E8=A1=A8=E5=8F=AA?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E4=B8=8A=E7=BA=A7i?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
index 36c5ee81..5bf7b6b9 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
@@ -473,7 +473,6 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
                     //查询主数据
                     MdmModuleEntity queryMdmModuleEntity = new MdmModuleEntity();
                     queryMdmModuleEntity.setSts("Y");
-                    queryMdmModuleEntity.setMdmCode(10021L);
                     List<MdmModuleEntity> mdmModuleEntities = mdmModuleDao.queryBase(queryMdmModuleEntity);
                     if(mdmModuleEntities == null || mdmModuleEntities.size() == 0){
                         return BaseResult.getSuccessMessageEntity("主数据未设置，不需要下发");