Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project

 Conflicts:

	service/src/main/java/com/hzya/frame/sysnew/login/impl/LoginServiceImpl.java

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/IMdmOrgDao.java

@@ -0,0 +1,15 @@
+package masterData.dao;
+
+import masterData.entity.MdmOrgEntity;
+import com.hzya.frame.basedao.dao.IBaseDao; 
+
+/**
+ * 组织档案(mdm_org: table)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-06-07 18:30:04
+ */
+public interface IMdmOrgDao extends IBaseDao<MdmOrgEntity, String> {
+
+}
+

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/impl/MdmOrgDaoImpl.java

@@ -0,0 +1,16 @@
+package masterData.dao.impl;
+
+import masterData.entity.MdmOrgEntity;
+import masterData.dao.IMdmOrgDao;
+import org.springframework.stereotype.Repository;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+/**
+ * 组织档案(MdmOrg)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-06-07 18:30:04
+ */
+public class MdmOrgDaoImpl extends MybatisGenericDao<MdmOrgEntity, String> implements IMdmOrgDao{
+ 
+}
+

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.java

@@ -0,0 +1,196 @@
+package masterData.entity;
+
+import java.util.Date;
+import com.hzya.frame.web.entity.BaseEntity;
+/**
+ * 组织档案(MdmOrg)实体类
+ *
+ * @author makejava
+ * @since 2024-06-07 18:30:04
+ */
+public class MdmOrgEntity extends BaseEntity {
+ 
+  /**  单据规则 */
+   private String documentRule;
+  /**  单据规则流水号 */
+   private Long documentRuleNum;
+  /**  组织编码 */
+   private String orgCode;
+  /**  组织名称 */
+   private String orgName;
+  /**  地址 */
+   private String orgAddress;
+  /**  国家地区 */
+   private String orgCountryzone;
+  /**  内部编码 */
+   private String orgInnercode;
+  /**  说明 */
+   private String orgMemo;
+  /**  助记码 */
+   private String orgMnecode;
+  /**  所属行业 */
+   private String orgNcindustry;
+  /**  上级业务单元 */
+   private String orgFatherorg;
+  /**  负责人 */
+   private String orgPrincipal;
+  /**  电话 */
+   private String orgTel;
+  /**  数据状态 Y正常 N删除 F修改 */
+   private String dataStatus;
+  /**  新增数据状态 0待下发 1已下发 */
+   private String addStatus;
+  /**  修改数据状态 0待下发 1已下发 */
+   private String updateStatus;
+  /**  删除数据状态 0待下发 1已下发 */
+   private String deleteStatus;
+  /**  公司id */
+   private String companyId;
+
+
+    public String getDocumentRule() {
+        return documentRule;
+    }
+
+    public void setDocumentRule(String documentRule) {
+        this.documentRule = documentRule;
+    }
+
+    public Long getDocumentRuleNum() {
+        return documentRuleNum;
+    }
+
+    public void setDocumentRuleNum(Long documentRuleNum) {
+        this.documentRuleNum = documentRuleNum;
+    }
+
+    public String getOrgCode() {
+        return orgCode;
+    }
+
+    public void setOrgCode(String orgCode) {
+        this.orgCode = orgCode;
+    }
+
+    public String getOrgName() {
+        return orgName;
+    }
+
+    public void setOrgName(String orgName) {
+        this.orgName = orgName;
+    }
+
+    public String getOrgAddress() {
+        return orgAddress;
+    }
+
+    public void setOrgAddress(String orgAddress) {
+        this.orgAddress = orgAddress;
+    }
+
+    public String getOrgCountryzone() {
+        return orgCountryzone;
+    }
+
+    public void setOrgCountryzone(String orgCountryzone) {
+        this.orgCountryzone = orgCountryzone;
+    }
+
+    public String getOrgInnercode() {
+        return orgInnercode;
+    }
+
+    public void setOrgInnercode(String orgInnercode) {
+        this.orgInnercode = orgInnercode;
+    }
+
+    public String getOrgMemo() {
+        return orgMemo;
+    }
+
+    public void setOrgMemo(String orgMemo) {
+        this.orgMemo = orgMemo;
+    }
+
+    public String getOrgMnecode() {
+        return orgMnecode;
+    }
+
+    public void setOrgMnecode(String orgMnecode) {
+        this.orgMnecode = orgMnecode;
+    }
+
+    public String getOrgNcindustry() {
+        return orgNcindustry;
+    }
+
+    public void setOrgNcindustry(String orgNcindustry) {
+        this.orgNcindustry = orgNcindustry;
+    }
+
+    public String getOrgFatherorg() {
+        return orgFatherorg;
+    }
+
+    public void setOrgFatherorg(String orgFatherorg) {
+        this.orgFatherorg = orgFatherorg;
+    }
+
+    public String getOrgPrincipal() {
+        return orgPrincipal;
+    }
+
+    public void setOrgPrincipal(String orgPrincipal) {
+        this.orgPrincipal = orgPrincipal;
+    }
+
+    public String getOrgTel() {
+        return orgTel;
+    }
+
+    public void setOrgTel(String orgTel) {
+        this.orgTel = orgTel;
+    }
+
+    public String getDataStatus() {
+        return dataStatus;
+    }
+
+    public void setDataStatus(String dataStatus) {
+        this.dataStatus = dataStatus;
+    }
+
+    public String getAddStatus() {
+        return addStatus;
+    }
+
+    public void setAddStatus(String addStatus) {
+        this.addStatus = addStatus;
+    }
+
+    public String getUpdateStatus() {
+        return updateStatus;
+    }
+
+    public void setUpdateStatus(String updateStatus) {
+        this.updateStatus = updateStatus;
+    }
+
+    public String getDeleteStatus() {
+        return deleteStatus;
+    }
+
+    public void setDeleteStatus(String deleteStatus) {
+        this.deleteStatus = deleteStatus;
+    }
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+}
+

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.xml

@@ -0,0 +1,388 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="masterData.dao.impl.MdmOrgDaoImpl">
+
+    <resultMap id="get-MdmOrgEntity-result" type="masterData.entity.MdmOrgEntity" >
+       <result property="id" column="id" jdbcType="VARCHAR"/>
+           <result property="documentRule" column="document_rule" jdbcType="VARCHAR"/>
+           <result property="documentRuleNum" column="document_rule_num" jdbcType="INTEGER"/>
+           <result property="orgCode" column="org_code" jdbcType="VARCHAR"/>
+           <result property="orgName" column="org_name" jdbcType="VARCHAR"/>
+           <result property="orgAddress" column="org_address" jdbcType="VARCHAR"/>
+           <result property="orgCountryzone" column="org_countryzone" jdbcType="VARCHAR"/>
+           <result property="orgInnercode" column="org_innercode" jdbcType="VARCHAR"/>
+           <result property="orgMemo" column="org_memo" jdbcType="VARCHAR"/>
+           <result property="orgMnecode" column="org_mnecode" jdbcType="VARCHAR"/>
+           <result property="orgNcindustry" column="org_ncindustry" jdbcType="VARCHAR"/>
+           <result property="orgFatherorg" column="org_fatherorg" jdbcType="VARCHAR"/>
+           <result property="orgPrincipal" column="org_principal" jdbcType="VARCHAR"/>
+           <result property="orgTel" column="org_tel" jdbcType="VARCHAR"/>
+           <result property="dataStatus" column="data_status" jdbcType="VARCHAR"/>
+           <result property="addStatus" column="add_status" jdbcType="VARCHAR"/>
+           <result property="updateStatus" column="update_status" jdbcType="VARCHAR"/>
+           <result property="deleteStatus" column="delete_status" 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 = "MdmOrgEntity_Base_Column_List">
+        id
+       ,document_rule 
+        ,document_rule_num 
+        ,org_code 
+        ,org_name 
+        ,org_address 
+        ,org_countryzone 
+        ,org_innercode 
+        ,org_memo 
+        ,org_mnecode 
+        ,org_ncindustry 
+        ,org_fatherorg 
+        ,org_principal 
+        ,org_tel 
+        ,data_status 
+        ,add_status 
+        ,update_status 
+        ,delete_status 
+        ,sorts 
+        ,create_user_id 
+        ,create_time 
+        ,modify_user_id 
+        ,modify_time 
+        ,sts 
+        ,org_id 
+        ,company_id 
+     </sql>
+ <!-- 查询 采用==查询 -->
+ <select id="entity_list_base" resultMap="get-MdmOrgEntity-result" parameterType = "masterData.entity.MdmOrgEntity">
+    select
+    <include refid="MdmOrgEntity_Base_Column_List" />
+    from mdm_org
+    <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id = #{id} </if>
+            <if test="documentRule != null and documentRule != ''"> and document_rule = #{documentRule} </if>
+            <if test="documentRuleNum != null"> and document_rule_num = #{documentRuleNum} </if>
+            <if test="orgCode != null and orgCode != ''"> and org_code = #{orgCode} </if>
+            <if test="orgName != null and orgName != ''"> and org_name = #{orgName} </if>
+            <if test="orgAddress != null and orgAddress != ''"> and org_address = #{orgAddress} </if>
+            <if test="orgCountryzone != null and orgCountryzone != ''"> and org_countryzone = #{orgCountryzone} </if>
+            <if test="orgInnercode != null and orgInnercode != ''"> and org_innercode = #{orgInnercode} </if>
+            <if test="orgMemo != null and orgMemo != ''"> and org_memo = #{orgMemo} </if>
+            <if test="orgMnecode != null and orgMnecode != ''"> and org_mnecode = #{orgMnecode} </if>
+            <if test="orgNcindustry != null and orgNcindustry != ''"> and org_ncindustry = #{orgNcindustry} </if>
+            <if test="orgFatherorg != null and orgFatherorg != ''"> and org_fatherorg = #{orgFatherorg} </if>
+            <if test="orgPrincipal != null and orgPrincipal != ''"> and org_principal = #{orgPrincipal} </if>
+            <if test="orgTel != null and orgTel != ''"> and org_tel = #{orgTel} </if>
+            <if test="dataStatus != null and dataStatus != ''"> and data_status = #{dataStatus} </if>
+            <if test="addStatus != null and addStatus != ''"> and add_status = #{addStatus} </if>
+            <if test="updateStatus != null and updateStatus != ''"> and update_status = #{updateStatus} </if>
+            <if test="deleteStatus != null and deleteStatus != ''"> and delete_status = #{deleteStatus} </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 = "masterData.entity.MdmOrgEntity">
+        select  count(1)   from mdm_org
+    <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id = #{id} </if>
+            <if test="documentRule != null and documentRule != ''"> and document_rule = #{documentRule} </if>
+            <if test="documentRuleNum != null"> and document_rule_num = #{documentRuleNum} </if>
+            <if test="orgCode != null and orgCode != ''"> and org_code = #{orgCode} </if>
+            <if test="orgName != null and orgName != ''"> and org_name = #{orgName} </if>
+            <if test="orgAddress != null and orgAddress != ''"> and org_address = #{orgAddress} </if>
+            <if test="orgCountryzone != null and orgCountryzone != ''"> and org_countryzone = #{orgCountryzone} </if>
+            <if test="orgInnercode != null and orgInnercode != ''"> and org_innercode = #{orgInnercode} </if>
+            <if test="orgMemo != null and orgMemo != ''"> and org_memo = #{orgMemo} </if>
+            <if test="orgMnecode != null and orgMnecode != ''"> and org_mnecode = #{orgMnecode} </if>
+            <if test="orgNcindustry != null and orgNcindustry != ''"> and org_ncindustry = #{orgNcindustry} </if>
+            <if test="orgFatherorg != null and orgFatherorg != ''"> and org_fatherorg = #{orgFatherorg} </if>
+            <if test="orgPrincipal != null and orgPrincipal != ''"> and org_principal = #{orgPrincipal} </if>
+            <if test="orgTel != null and orgTel != ''"> and org_tel = #{orgTel} </if>
+            <if test="dataStatus != null and dataStatus != ''"> and data_status = #{dataStatus} </if>
+            <if test="addStatus != null and addStatus != ''"> and add_status = #{addStatus} </if>
+            <if test="updateStatus != null and updateStatus != ''"> and update_status = #{updateStatus} </if>
+            <if test="deleteStatus != null and deleteStatus != ''"> and delete_status = #{deleteStatus} </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>
+
+    <!-- 分页查询列表 采用like格式 -->
+<select id="entity_list_like" resultMap="get-MdmOrgEntity-result" parameterType = "masterData.entity.MdmOrgEntity">
+    select
+    <include refid="MdmOrgEntity_Base_Column_List" />
+    from mdm_org
+    <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id like concat('%',#{id},'%') </if>
+            <if test="documentRule != null and documentRule != ''"> and document_rule like concat('%',#{documentRule},'%') </if>
+            <if test="documentRuleNum != null"> and document_rule_num like concat('%',#{documentRuleNum},'%') </if>
+            <if test="orgCode != null and orgCode != ''"> and org_code like concat('%',#{orgCode},'%') </if>
+            <if test="orgName != null and orgName != ''"> and org_name like concat('%',#{orgName},'%') </if>
+            <if test="orgAddress != null and orgAddress != ''"> and org_address like concat('%',#{orgAddress},'%') </if>
+            <if test="orgCountryzone != null and orgCountryzone != ''"> and org_countryzone like concat('%',#{orgCountryzone},'%') </if>
+            <if test="orgInnercode != null and orgInnercode != ''"> and org_innercode like concat('%',#{orgInnercode},'%') </if>
+            <if test="orgMemo != null and orgMemo != ''"> and org_memo like concat('%',#{orgMemo},'%') </if>
+            <if test="orgMnecode != null and orgMnecode != ''"> and org_mnecode like concat('%',#{orgMnecode},'%') </if>
+            <if test="orgNcindustry != null and orgNcindustry != ''"> and org_ncindustry like concat('%',#{orgNcindustry},'%') </if>
+            <if test="orgFatherorg != null and orgFatherorg != ''"> and org_fatherorg like concat('%',#{orgFatherorg},'%') </if>
+            <if test="orgPrincipal != null and orgPrincipal != ''"> and org_principal like concat('%',#{orgPrincipal},'%') </if>
+            <if test="orgTel != null and orgTel != ''"> and org_tel like concat('%',#{orgTel},'%') </if>
+            <if test="dataStatus != null and dataStatus != ''"> and data_status like concat('%',#{dataStatus},'%') </if>
+            <if test="addStatus != null and addStatus != ''"> and add_status like concat('%',#{addStatus},'%') </if>
+            <if test="updateStatus != null and updateStatus != ''"> and update_status like concat('%',#{updateStatus},'%') </if>
+            <if test="deleteStatus != null and deleteStatus != ''"> and delete_status like concat('%',#{deleteStatus},'%') </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>
+
+<!-- 查询列表 字段采用or格式 -->
+<select id="MdmOrgentity_list_or" resultMap="get-MdmOrgEntity-result" parameterType = "masterData.entity.MdmOrgEntity">
+    select
+    <include refid="MdmOrgEntity_Base_Column_List" />
+    from mdm_org
+    <trim prefix="where" prefixOverrides="and"> 
+         <if test="id != null and id != ''"> or id = #{id} </if>
+             <if test="documentRule != null and documentRule != ''"> or document_rule = #{documentRule} </if>
+             <if test="documentRuleNum != null"> or document_rule_num = #{documentRuleNum} </if>
+             <if test="orgCode != null and orgCode != ''"> or org_code = #{orgCode} </if>
+             <if test="orgName != null and orgName != ''"> or org_name = #{orgName} </if>
+             <if test="orgAddress != null and orgAddress != ''"> or org_address = #{orgAddress} </if>
+             <if test="orgCountryzone != null and orgCountryzone != ''"> or org_countryzone = #{orgCountryzone} </if>
+             <if test="orgInnercode != null and orgInnercode != ''"> or org_innercode = #{orgInnercode} </if>
+             <if test="orgMemo != null and orgMemo != ''"> or org_memo = #{orgMemo} </if>
+             <if test="orgMnecode != null and orgMnecode != ''"> or org_mnecode = #{orgMnecode} </if>
+             <if test="orgNcindustry != null and orgNcindustry != ''"> or org_ncindustry = #{orgNcindustry} </if>
+             <if test="orgFatherorg != null and orgFatherorg != ''"> or org_fatherorg = #{orgFatherorg} </if>
+             <if test="orgPrincipal != null and orgPrincipal != ''"> or org_principal = #{orgPrincipal} </if>
+             <if test="orgTel != null and orgTel != ''"> or org_tel = #{orgTel} </if>
+             <if test="dataStatus != null and dataStatus != ''"> or data_status = #{dataStatus} </if>
+             <if test="addStatus != null and addStatus != ''"> or add_status = #{addStatus} </if>
+             <if test="updateStatus != null and updateStatus != ''"> or update_status = #{updateStatus} </if>
+             <if test="deleteStatus != null and deleteStatus != ''"> or delete_status = #{deleteStatus} </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>
+
+<!--新增所有列-->
+<insert id="entity_insert" parameterType = "masterData.entity.MdmOrgEntity" keyProperty="id" useGeneratedKeys="true">
+    insert into mdm_org(
+  <trim suffix="" suffixOverrides=",">
+       <if test="id != null and id != ''"> id , </if>
+            <if test="documentRule != null and documentRule != ''"> document_rule , </if>
+            <if test="documentRuleNum != null"> document_rule_num , </if>
+            <if test="orgCode != null and orgCode != ''"> org_code , </if>
+            <if test="orgName != null and orgName != ''"> org_name , </if>
+            <if test="orgAddress != null and orgAddress != ''"> org_address , </if>
+            <if test="orgCountryzone != null and orgCountryzone != ''"> org_countryzone , </if>
+            <if test="orgInnercode != null and orgInnercode != ''"> org_innercode , </if>
+            <if test="orgMemo != null and orgMemo != ''"> org_memo , </if>
+            <if test="orgMnecode != null and orgMnecode != ''"> org_mnecode , </if>
+            <if test="orgNcindustry != null and orgNcindustry != ''"> org_ncindustry , </if>
+            <if test="orgFatherorg != null and orgFatherorg != ''"> org_fatherorg , </if>
+            <if test="orgPrincipal != null and orgPrincipal != ''"> org_principal , </if>
+            <if test="orgTel != null and orgTel != ''"> org_tel , </if>
+            <if test="dataStatus != null and dataStatus != ''"> data_status , </if>
+            <if test="addStatus != null and addStatus != ''"> add_status , </if>
+            <if test="updateStatus != null and updateStatus != ''"> update_status , </if>
+            <if test="deleteStatus != null and deleteStatus != ''"> delete_status , </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="sorts == null ">sorts,</if>
+    <if test="sts == null ">sts,</if>
+  </trim>
+  )values(
+ <trim suffix="" suffixOverrides=",">
+       <if test="id != null and id != ''"> #{id} ,</if>
+            <if test="documentRule != null and documentRule != ''"> #{documentRule} ,</if>
+            <if test="documentRuleNum != null"> #{documentRuleNum} ,</if>
+            <if test="orgCode != null and orgCode != ''"> #{orgCode} ,</if>
+            <if test="orgName != null and orgName != ''"> #{orgName} ,</if>
+            <if test="orgAddress != null and orgAddress != ''"> #{orgAddress} ,</if>
+            <if test="orgCountryzone != null and orgCountryzone != ''"> #{orgCountryzone} ,</if>
+            <if test="orgInnercode != null and orgInnercode != ''"> #{orgInnercode} ,</if>
+            <if test="orgMemo != null and orgMemo != ''"> #{orgMemo} ,</if>
+            <if test="orgMnecode != null and orgMnecode != ''"> #{orgMnecode} ,</if>
+            <if test="orgNcindustry != null and orgNcindustry != ''"> #{orgNcindustry} ,</if>
+            <if test="orgFatherorg != null and orgFatherorg != ''"> #{orgFatherorg} ,</if>
+            <if test="orgPrincipal != null and orgPrincipal != ''"> #{orgPrincipal} ,</if>
+            <if test="orgTel != null and orgTel != ''"> #{orgTel} ,</if>
+            <if test="dataStatus != null and dataStatus != ''"> #{dataStatus} ,</if>
+            <if test="addStatus != null and addStatus != ''"> #{addStatus} ,</if>
+            <if test="updateStatus != null and updateStatus != ''"> #{updateStatus} ,</if>
+            <if test="deleteStatus != null and deleteStatus != ''"> #{deleteStatus} ,</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="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_org a WHERE a.sts = 'Y' ),</if>
+    <if test="sts == null ">'Y',</if>
+  </trim>
+  )  
+</insert>
+<!-- 批量新增 -->
+<insert id="entityInsertBatch" keyProperty="id" useGeneratedKeys="true">
+  insert into mdm_org(document_rule, document_rule_num, org_code, org_name, org_address, org_countryzone, org_innercode, org_memo, org_mnecode, org_ncindustry, org_fatherorg, org_principal, org_tel, data_status, add_status, update_status, delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id,  sts) 
+    values
+    <foreach collection="entities" item="entity" separator=",">
+    (#{entity.documentRule},#{entity.documentRuleNum},#{entity.orgCode},#{entity.orgName},#{entity.orgAddress},#{entity.orgCountryzone},#{entity.orgInnercode},#{entity.orgMemo},#{entity.orgMnecode},#{entity.orgNcindustry},#{entity.orgFatherorg},#{entity.orgPrincipal},#{entity.orgTel},#{entity.dataStatus},#{entity.addStatus},#{entity.updateStatus},#{entity.deleteStatus},#{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" keyProperty="id" useGeneratedKeys="true">
+    insert into mdm_org(document_rule, document_rule_num, org_code, org_name, org_address, org_countryzone, org_innercode, org_memo, org_mnecode, org_ncindustry, org_fatherorg, org_principal, org_tel, data_status, add_status, update_status, delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id)
+    values
+    <foreach collection="entities" item="entity" separator=",">
+    (#{entity.documentRule},#{entity.documentRuleNum},#{entity.orgCode},#{entity.orgName},#{entity.orgAddress},#{entity.orgCountryzone},#{entity.orgInnercode},#{entity.orgMemo},#{entity.orgMnecode},#{entity.orgNcindustry},#{entity.orgFatherorg},#{entity.orgPrincipal},#{entity.orgTel},#{entity.dataStatus},#{entity.addStatus},#{entity.updateStatus},#{entity.deleteStatus},#{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
+    document_rule = values(document_rule),
+    document_rule_num = values(document_rule_num),
+    org_code = values(org_code),
+    org_name = values(org_name),
+    org_address = values(org_address),
+    org_countryzone = values(org_countryzone),
+    org_innercode = values(org_innercode),
+    org_memo = values(org_memo),
+    org_mnecode = values(org_mnecode),
+    org_ncindustry = values(org_ncindustry),
+    org_fatherorg = values(org_fatherorg),
+    org_principal = values(org_principal),
+    org_tel = values(org_tel),
+    data_status = values(data_status),
+    add_status = values(add_status),
+    update_status = values(update_status),
+    delete_status = values(delete_status),
+    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 = "masterData.entity.MdmOrgEntity" >
+update mdm_org  set
+<trim suffix="" suffixOverrides=",">
+  <if test="documentRule != null and documentRule != ''"> document_rule = #{documentRule},</if>
+  <if test="documentRuleNum != null"> document_rule_num = #{documentRuleNum},</if>
+  <if test="orgCode != null and orgCode != ''"> org_code = #{orgCode},</if>
+  <if test="orgName != null and orgName != ''"> org_name = #{orgName},</if>
+  <if test="orgAddress != null and orgAddress != ''"> org_address = #{orgAddress},</if>
+  <if test="orgCountryzone != null and orgCountryzone != ''"> org_countryzone = #{orgCountryzone},</if>
+  <if test="orgInnercode != null and orgInnercode != ''"> org_innercode = #{orgInnercode},</if>
+  <if test="orgMemo != null and orgMemo != ''"> org_memo = #{orgMemo},</if>
+  <if test="orgMnecode != null and orgMnecode != ''"> org_mnecode = #{orgMnecode},</if>
+  <if test="orgNcindustry != null and orgNcindustry != ''"> org_ncindustry = #{orgNcindustry},</if>
+  <if test="orgFatherorg != null and orgFatherorg != ''"> org_fatherorg = #{orgFatherorg},</if>
+  <if test="orgPrincipal != null and orgPrincipal != ''"> org_principal = #{orgPrincipal},</if>
+  <if test="orgTel != null and orgTel != ''"> org_tel = #{orgTel},</if>
+  <if test="dataStatus != null and dataStatus != ''"> data_status = #{dataStatus},</if>
+  <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>
+  <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 = "masterData.entity.MdmOrgEntity" >
+update mdm_org  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+where id = #{id}
+</update>
+<!-- 多条件逻辑删除 -->
+<update id="entity_logicDelete_Multi_Condition" parameterType = "masterData.entity.MdmOrgEntity" >
+update mdm_org  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="documentRule != null and documentRule != ''"> and document_rule = #{documentRule} </if>
+            <if test="documentRuleNum != null"> and document_rule_num = #{documentRuleNum} </if>
+            <if test="orgCode != null and orgCode != ''"> and org_code = #{orgCode} </if>
+            <if test="orgName != null and orgName != ''"> and org_name = #{orgName} </if>
+            <if test="orgAddress != null and orgAddress != ''"> and org_address = #{orgAddress} </if>
+            <if test="orgCountryzone != null and orgCountryzone != ''"> and org_countryzone = #{orgCountryzone} </if>
+            <if test="orgInnercode != null and orgInnercode != ''"> and org_innercode = #{orgInnercode} </if>
+            <if test="orgMemo != null and orgMemo != ''"> and org_memo = #{orgMemo} </if>
+            <if test="orgMnecode != null and orgMnecode != ''"> and org_mnecode = #{orgMnecode} </if>
+            <if test="orgNcindustry != null and orgNcindustry != ''"> and org_ncindustry = #{orgNcindustry} </if>
+            <if test="orgFatherorg != null and orgFatherorg != ''"> and org_fatherorg = #{orgFatherorg} </if>
+            <if test="orgPrincipal != null and orgPrincipal != ''"> and org_principal = #{orgPrincipal} </if>
+            <if test="orgTel != null and orgTel != ''"> and org_tel = #{orgTel} </if>
+            <if test="dataStatus != null and dataStatus != ''"> and data_status = #{dataStatus} </if>
+            <if test="addStatus != null and addStatus != ''"> and add_status = #{addStatus} </if>
+            <if test="updateStatus != null and updateStatus != ''"> and update_status = #{updateStatus} </if>
+            <if test="deleteStatus != null and deleteStatus != ''"> and delete_status = #{deleteStatus} </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_org where id = #{id}
+</delete>
+
+</mapper>
+

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/plugin/MdmOrgPluginInitializer.java

@@ -0,0 +1,62 @@
+package com.hzya.frame.plugin.masterData.org.plugin;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.base.PluginBaseEntity;
+import com.hzya.frame.sysnew.comparison.masterData.service.impl.MasterDataOrgsServiceImpl;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * 组织档案(MdmOrg)表服务接口
+ *
+ * @author makejava
+ * @since 2024-06-07 18:30:05
+ */
+public class MdmOrgPluginInitializer extends PluginBaseEntity{
+    Logger logger = LoggerFactory.getLogger(MdmOrgPluginInitializer.class);
+    @Autowired
+    private MasterDataOrgsServiceImpl masterDataOrgsService;
+
+      @Override
+    public void initialize() {
+        logger.info(getPluginLabel() + "執行初始化方法initialize()");
+    }
+
+    @Override
+    public void destroy() {
+        logger.info(getPluginLabel() + "執行銷毀方法destroy()");
+    }
+
+    @Override
+    public String getPluginId() {
+        return "MdmOrgPlugin";
+    }
+
+    @Override
+    public String getPluginName() {
+        return "MdmOrgPlugin插件";
+    }
+
+    @Override
+    public String getPluginLabel() {
+        return "MdmOrgPlugin";
+    }
+
+    @Override
+    public String getPluginType() {
+        return "1";
+    }
+    @Override
+    public JsonResultEntity executeBusiness(JSONObject requestJson) {
+          try {
+              logger.info("======开始执行主数据档案组织档案同步========");
+             return masterDataOrgsService.queryOrgsArchives(requestJson);
+          }catch (Exception e){
+              logger.info("======执行主数据档案组织档案同步失败:{}========",e.getMessage());
+              e.printStackTrace();
+          }
+          return null;
+    }
+}

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/IMdmOrgService.java

@@ -0,0 +1,12 @@
+package masterData.service;
+
+import masterData.entity.MdmOrgEntity;
+import com.hzya.frame.basedao.service.IBaseService;
+/**
+ * 组织档案(MdmOrg)表服务接口
+ *
+ * @author makejava
+ * @since 2024-06-07 18:30:05
+ */
+public interface IMdmOrgService extends IBaseService<MdmOrgEntity, String>{
+}

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/impl/MdmOrgServiceImpl.java

@@ -0,0 +1,25 @@
+package masterData.service.impl;
+
+import masterData.entity.MdmOrgEntity;
+import masterData.dao.IMdmOrgDao;
+import masterData.service.IMdmOrgService;
+import org.springframework.stereotype.Service; 
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
+import com.hzya.frame.basedao.service.impl.BaseService;
+/**
+ * 组织档案(MdmOrg)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-06-07 18:30:05
+ */
+public class MdmOrgServiceImpl extends BaseService<MdmOrgEntity, String> implements IMdmOrgService {
+     
+    private IMdmOrgDao mdmOrgDao;
+    
+    @Autowired
+	public void setMdmOrgDao(IMdmOrgDao dao) {
+		this.mdmOrgDao = dao;
+		this.dao = dao;
+	}
+}

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/IMdmProjectDao.java

@@ -0,0 +1,15 @@
+package masterData.dao;
+
+import masterData.entity.MdmProjectEntity;
+import com.hzya.frame.basedao.dao.IBaseDao; 
+
+/**
+ * 项目档案(mdm_project: table)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-06-07 18:29:23
+ */
+public interface IMdmProjectDao extends IBaseDao<MdmProjectEntity, String> {
+
+}
+

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/impl/MdmProjectDaoImpl.java

@@ -0,0 +1,16 @@
+package masterData.dao.impl;
+
+import masterData.entity.MdmProjectEntity;
+import masterData.dao.IMdmProjectDao;
+import org.springframework.stereotype.Repository;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+/**
+ * 项目档案(MdmProject)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-06-07 18:29:23
+ */
+public class MdmProjectDaoImpl extends MybatisGenericDao<MdmProjectEntity, String> implements IMdmProjectDao{
+ 
+}
+

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.java

@@ -0,0 +1,186 @@
+package masterData.entity;
+
+import java.util.Date;
+import com.hzya.frame.web.entity.BaseEntity;
+/**
+ * 项目档案(MdmProject)实体类
+ *
+ * @author makejava
+ * @since 2024-06-07 18:29:23
+ */
+public class MdmProjectEntity extends BaseEntity {
+ 
+  /**  单据规则 */
+   private String documentRule;
+  /**  单据规则流水号 */
+   private Long documentRuleNum;
+  /**  项目编码 */
+   private String projectCode;
+  /**  项目名称 */
+   private String projectName;
+  /**  单据类型 */
+   private String projectBillType;
+  /**  备注 */
+   private String projectMemo;
+  /**  币种 */
+   private String projectCurrtype;
+  /**  责任人 */
+   private String projectDutier;
+  /**  责任部门 */
+   private String projectDutyDept;
+  /**  管理组织 */
+   private String projectOrg;
+  /**  父项目 */
+   private String projectParentpro;
+  /**  项目简称 */
+   private String projectShName;
+  /**  数据状态 Y正常 N删除 F修改 */
+   private String dataStatus;
+  /**  新增数据状态 0待下发 1已下发 */
+   private String addStatus;
+  /**  修改数据状态 0待下发 1已下发 */
+   private String updateStatus;
+  /**  删除数据状态 0待下发 1已下发 */
+   private String deleteStatus;
+  /**  公司id */
+   private String companyId;
+
+
+    public String getDocumentRule() {
+        return documentRule;
+    }
+
+    public void setDocumentRule(String documentRule) {
+        this.documentRule = documentRule;
+    }
+
+    public Long getDocumentRuleNum() {
+        return documentRuleNum;
+    }
+
+    public void setDocumentRuleNum(Long documentRuleNum) {
+        this.documentRuleNum = documentRuleNum;
+    }
+
+    public String getProjectCode() {
+        return projectCode;
+    }
+
+    public void setProjectCode(String projectCode) {
+        this.projectCode = projectCode;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getProjectBillType() {
+        return projectBillType;
+    }
+
+    public void setProjectBillType(String projectBillType) {
+        this.projectBillType = projectBillType;
+    }
+
+    public String getProjectMemo() {
+        return projectMemo;
+    }
+
+    public void setProjectMemo(String projectMemo) {
+        this.projectMemo = projectMemo;
+    }
+
+    public String getProjectCurrtype() {
+        return projectCurrtype;
+    }
+
+    public void setProjectCurrtype(String projectCurrtype) {
+        this.projectCurrtype = projectCurrtype;
+    }
+
+    public String getProjectDutier() {
+        return projectDutier;
+    }
+
+    public void setProjectDutier(String projectDutier) {
+        this.projectDutier = projectDutier;
+    }
+
+    public String getProjectDutyDept() {
+        return projectDutyDept;
+    }
+
+    public void setProjectDutyDept(String projectDutyDept) {
+        this.projectDutyDept = projectDutyDept;
+    }
+
+    public String getProjectOrg() {
+        return projectOrg;
+    }
+
+    public void setProjectOrg(String projectOrg) {
+        this.projectOrg = projectOrg;
+    }
+
+    public String getProjectParentpro() {
+        return projectParentpro;
+    }
+
+    public void setProjectParentpro(String projectParentpro) {
+        this.projectParentpro = projectParentpro;
+    }
+
+    public String getProjectShName() {
+        return projectShName;
+    }
+
+    public void setProjectShName(String projectShName) {
+        this.projectShName = projectShName;
+    }
+
+    public String getDataStatus() {
+        return dataStatus;
+    }
+
+    public void setDataStatus(String dataStatus) {
+        this.dataStatus = dataStatus;
+    }
+
+    public String getAddStatus() {
+        return addStatus;
+    }
+
+    public void setAddStatus(String addStatus) {
+        this.addStatus = addStatus;
+    }
+
+    public String getUpdateStatus() {
+        return updateStatus;
+    }
+
+    public void setUpdateStatus(String updateStatus) {
+        this.updateStatus = updateStatus;
+    }
+
+    public String getDeleteStatus() {
+        return deleteStatus;
+    }
+
+    public void setDeleteStatus(String deleteStatus) {
+        this.deleteStatus = deleteStatus;
+    }
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+}
+

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.xml

@@ -0,0 +1,377 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="masterData.dao.impl.MdmProjectDaoImpl">
+
+    <resultMap id="get-MdmProjectEntity-result" type="masterData.entity.MdmProjectEntity" >
+       <result property="id" column="id" jdbcType="VARCHAR"/>
+           <result property="documentRule" column="document_rule" jdbcType="VARCHAR"/>
+           <result property="documentRuleNum" column="document_rule_num" jdbcType="INTEGER"/>
+           <result property="projectCode" column="project_code" jdbcType="VARCHAR"/>
+           <result property="projectName" column="project_name" jdbcType="VARCHAR"/>
+           <result property="projectBillType" column="project_bill_type" jdbcType="VARCHAR"/>
+           <result property="projectMemo" column="project_memo" jdbcType="VARCHAR"/>
+           <result property="projectCurrtype" column="project_currtype" jdbcType="VARCHAR"/>
+           <result property="projectDutier" column="project_dutier" jdbcType="VARCHAR"/>
+           <result property="projectDutyDept" column="project_duty_dept" jdbcType="VARCHAR"/>
+           <result property="projectOrg" column="project_org" jdbcType="VARCHAR"/>
+           <result property="projectParentpro" column="project_parentpro" jdbcType="VARCHAR"/>
+           <result property="projectShName" column="project_sh_name" jdbcType="VARCHAR"/>
+           <result property="dataStatus" column="data_status" jdbcType="VARCHAR"/>
+           <result property="addStatus" column="add_status" jdbcType="VARCHAR"/>
+           <result property="updateStatus" column="update_status" jdbcType="VARCHAR"/>
+           <result property="deleteStatus" column="delete_status" 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 = "MdmProjectEntity_Base_Column_List">
+        id
+       ,document_rule 
+        ,document_rule_num 
+        ,project_code 
+        ,project_name 
+        ,project_bill_type 
+        ,project_memo 
+        ,project_currtype 
+        ,project_dutier 
+        ,project_duty_dept 
+        ,project_org 
+        ,project_parentpro 
+        ,project_sh_name 
+        ,data_status 
+        ,add_status 
+        ,update_status 
+        ,delete_status 
+        ,sorts 
+        ,create_user_id 
+        ,create_time 
+        ,modify_user_id 
+        ,modify_time 
+        ,sts 
+        ,org_id 
+        ,company_id 
+     </sql>
+ <!-- 查询 采用==查询 -->
+ <select id="entity_list_base" resultMap="get-MdmProjectEntity-result" parameterType = "masterData.entity.MdmProjectEntity">
+    select
+    <include refid="MdmProjectEntity_Base_Column_List" />
+    from mdm_project
+    <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id = #{id} </if>
+            <if test="documentRule != null and documentRule != ''"> and document_rule = #{documentRule} </if>
+            <if test="documentRuleNum != null"> and document_rule_num = #{documentRuleNum} </if>
+            <if test="projectCode != null and projectCode != ''"> and project_code = #{projectCode} </if>
+            <if test="projectName != null and projectName != ''"> and project_name = #{projectName} </if>
+            <if test="projectBillType != null and projectBillType != ''"> and project_bill_type = #{projectBillType} </if>
+            <if test="projectMemo != null and projectMemo != ''"> and project_memo = #{projectMemo} </if>
+            <if test="projectCurrtype != null and projectCurrtype != ''"> and project_currtype = #{projectCurrtype} </if>
+            <if test="projectDutier != null and projectDutier != ''"> and project_dutier = #{projectDutier} </if>
+            <if test="projectDutyDept != null and projectDutyDept != ''"> and project_duty_dept = #{projectDutyDept} </if>
+            <if test="projectOrg != null and projectOrg != ''"> and project_org = #{projectOrg} </if>
+            <if test="projectParentpro != null and projectParentpro != ''"> and project_parentpro = #{projectParentpro} </if>
+            <if test="projectShName != null and projectShName != ''"> and project_sh_name = #{projectShName} </if>
+            <if test="dataStatus != null and dataStatus != ''"> and data_status = #{dataStatus} </if>
+            <if test="addStatus != null and addStatus != ''"> and add_status = #{addStatus} </if>
+            <if test="updateStatus != null and updateStatus != ''"> and update_status = #{updateStatus} </if>
+            <if test="deleteStatus != null and deleteStatus != ''"> and delete_status = #{deleteStatus} </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 = "masterData.entity.MdmProjectEntity">
+        select  count(1)   from mdm_project
+    <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id = #{id} </if>
+            <if test="documentRule != null and documentRule != ''"> and document_rule = #{documentRule} </if>
+            <if test="documentRuleNum != null"> and document_rule_num = #{documentRuleNum} </if>
+            <if test="projectCode != null and projectCode != ''"> and project_code = #{projectCode} </if>
+            <if test="projectName != null and projectName != ''"> and project_name = #{projectName} </if>
+            <if test="projectBillType != null and projectBillType != ''"> and project_bill_type = #{projectBillType} </if>
+            <if test="projectMemo != null and projectMemo != ''"> and project_memo = #{projectMemo} </if>
+            <if test="projectCurrtype != null and projectCurrtype != ''"> and project_currtype = #{projectCurrtype} </if>
+            <if test="projectDutier != null and projectDutier != ''"> and project_dutier = #{projectDutier} </if>
+            <if test="projectDutyDept != null and projectDutyDept != ''"> and project_duty_dept = #{projectDutyDept} </if>
+            <if test="projectOrg != null and projectOrg != ''"> and project_org = #{projectOrg} </if>
+            <if test="projectParentpro != null and projectParentpro != ''"> and project_parentpro = #{projectParentpro} </if>
+            <if test="projectShName != null and projectShName != ''"> and project_sh_name = #{projectShName} </if>
+            <if test="dataStatus != null and dataStatus != ''"> and data_status = #{dataStatus} </if>
+            <if test="addStatus != null and addStatus != ''"> and add_status = #{addStatus} </if>
+            <if test="updateStatus != null and updateStatus != ''"> and update_status = #{updateStatus} </if>
+            <if test="deleteStatus != null and deleteStatus != ''"> and delete_status = #{deleteStatus} </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>
+
+    <!-- 分页查询列表 采用like格式 -->
+<select id="entity_list_like" resultMap="get-MdmProjectEntity-result" parameterType = "masterData.entity.MdmProjectEntity">
+    select
+    <include refid="MdmProjectEntity_Base_Column_List" />
+    from mdm_project
+    <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id like concat('%',#{id},'%') </if>
+            <if test="documentRule != null and documentRule != ''"> and document_rule like concat('%',#{documentRule},'%') </if>
+            <if test="documentRuleNum != null"> and document_rule_num like concat('%',#{documentRuleNum},'%') </if>
+            <if test="projectCode != null and projectCode != ''"> and project_code like concat('%',#{projectCode},'%') </if>
+            <if test="projectName != null and projectName != ''"> and project_name like concat('%',#{projectName},'%') </if>
+            <if test="projectBillType != null and projectBillType != ''"> and project_bill_type like concat('%',#{projectBillType},'%') </if>
+            <if test="projectMemo != null and projectMemo != ''"> and project_memo like concat('%',#{projectMemo},'%') </if>
+            <if test="projectCurrtype != null and projectCurrtype != ''"> and project_currtype like concat('%',#{projectCurrtype},'%') </if>
+            <if test="projectDutier != null and projectDutier != ''"> and project_dutier like concat('%',#{projectDutier},'%') </if>
+            <if test="projectDutyDept != null and projectDutyDept != ''"> and project_duty_dept like concat('%',#{projectDutyDept},'%') </if>
+            <if test="projectOrg != null and projectOrg != ''"> and project_org like concat('%',#{projectOrg},'%') </if>
+            <if test="projectParentpro != null and projectParentpro != ''"> and project_parentpro like concat('%',#{projectParentpro},'%') </if>
+            <if test="projectShName != null and projectShName != ''"> and project_sh_name like concat('%',#{projectShName},'%') </if>
+            <if test="dataStatus != null and dataStatus != ''"> and data_status like concat('%',#{dataStatus},'%') </if>
+            <if test="addStatus != null and addStatus != ''"> and add_status like concat('%',#{addStatus},'%') </if>
+            <if test="updateStatus != null and updateStatus != ''"> and update_status like concat('%',#{updateStatus},'%') </if>
+            <if test="deleteStatus != null and deleteStatus != ''"> and delete_status like concat('%',#{deleteStatus},'%') </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>
+
+<!-- 查询列表 字段采用or格式 -->
+<select id="MdmProjectentity_list_or" resultMap="get-MdmProjectEntity-result" parameterType = "masterData.entity.MdmProjectEntity">
+    select
+    <include refid="MdmProjectEntity_Base_Column_List" />
+    from mdm_project
+    <trim prefix="where" prefixOverrides="and"> 
+         <if test="id != null and id != ''"> or id = #{id} </if>
+             <if test="documentRule != null and documentRule != ''"> or document_rule = #{documentRule} </if>
+             <if test="documentRuleNum != null"> or document_rule_num = #{documentRuleNum} </if>
+             <if test="projectCode != null and projectCode != ''"> or project_code = #{projectCode} </if>
+             <if test="projectName != null and projectName != ''"> or project_name = #{projectName} </if>
+             <if test="projectBillType != null and projectBillType != ''"> or project_bill_type = #{projectBillType} </if>
+             <if test="projectMemo != null and projectMemo != ''"> or project_memo = #{projectMemo} </if>
+             <if test="projectCurrtype != null and projectCurrtype != ''"> or project_currtype = #{projectCurrtype} </if>
+             <if test="projectDutier != null and projectDutier != ''"> or project_dutier = #{projectDutier} </if>
+             <if test="projectDutyDept != null and projectDutyDept != ''"> or project_duty_dept = #{projectDutyDept} </if>
+             <if test="projectOrg != null and projectOrg != ''"> or project_org = #{projectOrg} </if>
+             <if test="projectParentpro != null and projectParentpro != ''"> or project_parentpro = #{projectParentpro} </if>
+             <if test="projectShName != null and projectShName != ''"> or project_sh_name = #{projectShName} </if>
+             <if test="dataStatus != null and dataStatus != ''"> or data_status = #{dataStatus} </if>
+             <if test="addStatus != null and addStatus != ''"> or add_status = #{addStatus} </if>
+             <if test="updateStatus != null and updateStatus != ''"> or update_status = #{updateStatus} </if>
+             <if test="deleteStatus != null and deleteStatus != ''"> or delete_status = #{deleteStatus} </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>
+
+<!--新增所有列-->
+<insert id="entity_insert" parameterType = "masterData.entity.MdmProjectEntity" keyProperty="id" useGeneratedKeys="true">
+    insert into mdm_project(
+  <trim suffix="" suffixOverrides=",">
+       <if test="id != null and id != ''"> id , </if>
+            <if test="documentRule != null and documentRule != ''"> document_rule , </if>
+            <if test="documentRuleNum != null"> document_rule_num , </if>
+            <if test="projectCode != null and projectCode != ''"> project_code , </if>
+            <if test="projectName != null and projectName != ''"> project_name , </if>
+            <if test="projectBillType != null and projectBillType != ''"> project_bill_type , </if>
+            <if test="projectMemo != null and projectMemo != ''"> project_memo , </if>
+            <if test="projectCurrtype != null and projectCurrtype != ''"> project_currtype , </if>
+            <if test="projectDutier != null and projectDutier != ''"> project_dutier , </if>
+            <if test="projectDutyDept != null and projectDutyDept != ''"> project_duty_dept , </if>
+            <if test="projectOrg != null and projectOrg != ''"> project_org , </if>
+            <if test="projectParentpro != null and projectParentpro != ''"> project_parentpro , </if>
+            <if test="projectShName != null and projectShName != ''"> project_sh_name , </if>
+            <if test="dataStatus != null and dataStatus != ''"> data_status , </if>
+            <if test="addStatus != null and addStatus != ''"> add_status , </if>
+            <if test="updateStatus != null and updateStatus != ''"> update_status , </if>
+            <if test="deleteStatus != null and deleteStatus != ''"> delete_status , </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="sorts == null ">sorts,</if>
+    <if test="sts == null ">sts,</if>
+  </trim>
+  )values(
+ <trim suffix="" suffixOverrides=",">
+       <if test="id != null and id != ''"> #{id} ,</if>
+            <if test="documentRule != null and documentRule != ''"> #{documentRule} ,</if>
+            <if test="documentRuleNum != null"> #{documentRuleNum} ,</if>
+            <if test="projectCode != null and projectCode != ''"> #{projectCode} ,</if>
+            <if test="projectName != null and projectName != ''"> #{projectName} ,</if>
+            <if test="projectBillType != null and projectBillType != ''"> #{projectBillType} ,</if>
+            <if test="projectMemo != null and projectMemo != ''"> #{projectMemo} ,</if>
+            <if test="projectCurrtype != null and projectCurrtype != ''"> #{projectCurrtype} ,</if>
+            <if test="projectDutier != null and projectDutier != ''"> #{projectDutier} ,</if>
+            <if test="projectDutyDept != null and projectDutyDept != ''"> #{projectDutyDept} ,</if>
+            <if test="projectOrg != null and projectOrg != ''"> #{projectOrg} ,</if>
+            <if test="projectParentpro != null and projectParentpro != ''"> #{projectParentpro} ,</if>
+            <if test="projectShName != null and projectShName != ''"> #{projectShName} ,</if>
+            <if test="dataStatus != null and dataStatus != ''"> #{dataStatus} ,</if>
+            <if test="addStatus != null and addStatus != ''"> #{addStatus} ,</if>
+            <if test="updateStatus != null and updateStatus != ''"> #{updateStatus} ,</if>
+            <if test="deleteStatus != null and deleteStatus != ''"> #{deleteStatus} ,</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="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_project a WHERE a.sts = 'Y' ),</if>
+    <if test="sts == null ">'Y',</if>
+  </trim>
+  )  
+</insert>
+<!-- 批量新增 -->
+<insert id="entityInsertBatch" keyProperty="id" useGeneratedKeys="true">
+  insert into mdm_project(document_rule, document_rule_num, project_code, project_name, project_bill_type, project_memo, project_currtype, project_dutier, project_duty_dept, project_org, project_parentpro, project_sh_name, data_status, add_status, update_status, delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id,  sts) 
+    values
+    <foreach collection="entities" item="entity" separator=",">
+    (#{entity.documentRule},#{entity.documentRuleNum},#{entity.projectCode},#{entity.projectName},#{entity.projectBillType},#{entity.projectMemo},#{entity.projectCurrtype},#{entity.projectDutier},#{entity.projectDutyDept},#{entity.projectOrg},#{entity.projectParentpro},#{entity.projectShName},#{entity.dataStatus},#{entity.addStatus},#{entity.updateStatus},#{entity.deleteStatus},#{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" keyProperty="id" useGeneratedKeys="true">
+    insert into mdm_project(document_rule, document_rule_num, project_code, project_name, project_bill_type, project_memo, project_currtype, project_dutier, project_duty_dept, project_org, project_parentpro, project_sh_name, data_status, add_status, update_status, delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id)
+    values
+    <foreach collection="entities" item="entity" separator=",">
+    (#{entity.documentRule},#{entity.documentRuleNum},#{entity.projectCode},#{entity.projectName},#{entity.projectBillType},#{entity.projectMemo},#{entity.projectCurrtype},#{entity.projectDutier},#{entity.projectDutyDept},#{entity.projectOrg},#{entity.projectParentpro},#{entity.projectShName},#{entity.dataStatus},#{entity.addStatus},#{entity.updateStatus},#{entity.deleteStatus},#{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
+    document_rule = values(document_rule),
+    document_rule_num = values(document_rule_num),
+    project_code = values(project_code),
+    project_name = values(project_name),
+    project_bill_type = values(project_bill_type),
+    project_memo = values(project_memo),
+    project_currtype = values(project_currtype),
+    project_dutier = values(project_dutier),
+    project_duty_dept = values(project_duty_dept),
+    project_org = values(project_org),
+    project_parentpro = values(project_parentpro),
+    project_sh_name = values(project_sh_name),
+    data_status = values(data_status),
+    add_status = values(add_status),
+    update_status = values(update_status),
+    delete_status = values(delete_status),
+    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 = "masterData.entity.MdmProjectEntity" >
+update mdm_project  set
+<trim suffix="" suffixOverrides=",">
+  <if test="documentRule != null and documentRule != ''"> document_rule = #{documentRule},</if>
+  <if test="documentRuleNum != null"> document_rule_num = #{documentRuleNum},</if>
+  <if test="projectCode != null and projectCode != ''"> project_code = #{projectCode},</if>
+  <if test="projectName != null and projectName != ''"> project_name = #{projectName},</if>
+  <if test="projectBillType != null and projectBillType != ''"> project_bill_type = #{projectBillType},</if>
+  <if test="projectMemo != null and projectMemo != ''"> project_memo = #{projectMemo},</if>
+  <if test="projectCurrtype != null and projectCurrtype != ''"> project_currtype = #{projectCurrtype},</if>
+  <if test="projectDutier != null and projectDutier != ''"> project_dutier = #{projectDutier},</if>
+  <if test="projectDutyDept != null and projectDutyDept != ''"> project_duty_dept = #{projectDutyDept},</if>
+  <if test="projectOrg != null and projectOrg != ''"> project_org = #{projectOrg},</if>
+  <if test="projectParentpro != null and projectParentpro != ''"> project_parentpro = #{projectParentpro},</if>
+  <if test="projectShName != null and projectShName != ''"> project_sh_name = #{projectShName},</if>
+  <if test="dataStatus != null and dataStatus != ''"> data_status = #{dataStatus},</if>
+  <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>
+  <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 = "masterData.entity.MdmProjectEntity" >
+update mdm_project  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+where id = #{id}
+</update>
+<!-- 多条件逻辑删除 -->
+<update id="entity_logicDelete_Multi_Condition" parameterType = "masterData.entity.MdmProjectEntity" >
+update mdm_project  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="documentRule != null and documentRule != ''"> and document_rule = #{documentRule} </if>
+            <if test="documentRuleNum != null"> and document_rule_num = #{documentRuleNum} </if>
+            <if test="projectCode != null and projectCode != ''"> and project_code = #{projectCode} </if>
+            <if test="projectName != null and projectName != ''"> and project_name = #{projectName} </if>
+            <if test="projectBillType != null and projectBillType != ''"> and project_bill_type = #{projectBillType} </if>
+            <if test="projectMemo != null and projectMemo != ''"> and project_memo = #{projectMemo} </if>
+            <if test="projectCurrtype != null and projectCurrtype != ''"> and project_currtype = #{projectCurrtype} </if>
+            <if test="projectDutier != null and projectDutier != ''"> and project_dutier = #{projectDutier} </if>
+            <if test="projectDutyDept != null and projectDutyDept != ''"> and project_duty_dept = #{projectDutyDept} </if>
+            <if test="projectOrg != null and projectOrg != ''"> and project_org = #{projectOrg} </if>
+            <if test="projectParentpro != null and projectParentpro != ''"> and project_parentpro = #{projectParentpro} </if>
+            <if test="projectShName != null and projectShName != ''"> and project_sh_name = #{projectShName} </if>
+            <if test="dataStatus != null and dataStatus != ''"> and data_status = #{dataStatus} </if>
+            <if test="addStatus != null and addStatus != ''"> and add_status = #{addStatus} </if>
+            <if test="updateStatus != null and updateStatus != ''"> and update_status = #{updateStatus} </if>
+            <if test="deleteStatus != null and deleteStatus != ''"> and delete_status = #{deleteStatus} </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_project where id = #{id}
+</delete>
+
+</mapper>
+

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/plugin/MdmProjectPluginInitializer.java

@@ -0,0 +1,64 @@
+package com.hzya.frame.plugin.masterData.project.plugin;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.base.PluginBaseEntity;
+import com.hzya.frame.sysnew.comparison.masterData.service.impl.MasterDataProjectServiceImpl;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * 项目档案(MdmProject)表服务接口
+ *
+ * @author makejava
+ * @since 2024-06-07 18:29:23
+ */
+public class MdmProjectPluginInitializer extends PluginBaseEntity{
+    Logger logger = LoggerFactory.getLogger(MdmProjectPluginInitializer.class);
+
+    @Autowired
+    private MasterDataProjectServiceImpl masterDataProjectService;
+
+      @Override
+    public void initialize() {
+        logger.info(getPluginLabel() + "執行初始化方法initialize()");
+    }
+
+    @Override
+    public void destroy() {
+        logger.info(getPluginLabel() + "執行銷毀方法destroy()");
+    }
+
+    @Override
+    public String getPluginId() {
+        return "MdmProjectPlugin";
+    }
+
+    @Override
+    public String getPluginName() {
+        return "MdmProjectPlugin插件";
+    }
+
+    @Override
+    public String getPluginLabel() {
+        return "MdmProjectPlugin";
+    }
+
+    @Override
+    public String getPluginType() {
+        return "1";
+    }
+    @Override
+    public JsonResultEntity executeBusiness(JSONObject requestJson) {
+          try {
+              logger.info("=====开始执行主数据档案项目档案同步=======");
+              JsonResultEntity jsonResultEntity = masterDataProjectService.queryProjectArchives(requestJson);
+              return jsonResultEntity;
+          }catch (Exception e){
+              logger.info("======执行主数据档案项目档案同步失败:{}",e.getMessage());
+              e.printStackTrace();
+          }
+        return null;
+    }
+}

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/IMdmProjectService.java

@@ -0,0 +1,12 @@
+package masterData.service;
+
+import masterData.entity.MdmProjectEntity;
+import com.hzya.frame.basedao.service.IBaseService;
+/**
+ * 项目档案(MdmProject)表服务接口
+ *
+ * @author makejava
+ * @since 2024-06-07 18:29:23
+ */
+public interface IMdmProjectService extends IBaseService<MdmProjectEntity, String>{
+}

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/impl/MdmProjectServiceImpl.java

@@ -0,0 +1,25 @@
+package masterData.service.impl;
+
+import masterData.entity.MdmProjectEntity;
+import masterData.dao.IMdmProjectDao;
+import masterData.service.IMdmProjectService;
+import org.springframework.stereotype.Service; 
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
+import com.hzya.frame.basedao.service.impl.BaseService;
+/**
+ * 项目档案(MdmProject)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-06-07 18:29:23
+ */
+public class MdmProjectServiceImpl extends BaseService<MdmProjectEntity, String> implements IMdmProjectService {
+     
+    private IMdmProjectDao mdmProjectDao;
+    
+    @Autowired
+	public void setMdmProjectDao(IMdmProjectDao dao) {
+		this.mdmProjectDao = dao;
+		this.dao = dao;
+	}
+}

buildpackage/src/main/resources/application-hclocal.yml

@@ -6,18 +6,22 @@ logging:
   encodings: UTF-8
   file:
 #    日志保存路径
-    path: /Users/apple/Desktop/log/local
+    path: D:\yongansystem\kangarooDataCenter\v3\logs
 spring:
   datasource:
     dynamic:
       datasource:
         master:
-          url: jdbc:mysql://hzya.ufyct.com:9096/businesscenternew?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
+#          url: jdbc:mysql://hzya.ufyct.com:9096/businesscenternew?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
+#          username: root
+#          password: bd993088e8a7c3dc5f44441617f9b4bf
+#          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
+           url: jdbc:mysql://hzya.ufyct.com:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
            username: root
-          password: bd993088e8a7c3dc5f44441617f9b4bf
+           password: 62e4295b615a30dbf3b8ee96f41c820b
            driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
 savefile:
     #    文件保存路径
-  path: /Users/apple/Desktop/log/local
+  path: D:\yongansystem\kangarooDataCenter\v3\logs
 ax:
   url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface

buildpackage/src/main/resources/application-yuecheng.yml

@@ -0,0 +1,25 @@
+#######################本地环境#######################
+logging:
+  #日志级别 指定目录级别
+  level:
+    root: info
+  encodings: UTF-8
+  file:
+#    日志保存路径
+    path: /Users/xiangerlin/work/app/logs/yuecheng
+spring:
+  datasource:
+    dynamic:
+      datasource:
+        master:
+          url: jdbc:mysql://hzya.ufyct.com:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
+          username: root
+          password: 62e4295b615a30dbf3b8ee96f41c820b
+          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
+savefile:
+    #    文件保存路径
+  path: /Users/xiangerlin/work/app/logs/yuecheng
+cbs8:
+  appId: 1P4AGrpz
+  appSecret: 2c2369ae5dc04382844bbe3a5abf39e1bea9cd3a
+  url: https://cbs8-openapi-reprd.csuat.cmburl.cn

buildpackage/src/main/resources/flyway/V3.0.3__mdm_add_updateApi_and_enabledState.sql

@@ -0,0 +1,3 @@
+ALTER TABLE mdm_module_distribute ADD COLUMN update_api VARCHAR(50) DEFAULT NULL COMMENT '修改接口';
+ALTER TABLE mdm_module_distribute ADD COLUMN enabled_state CHAR(1) DEFAULT NULL COMMENT '启用停用 0、停用1、启用';
+COMMIT;

common/src/main/java/com/hzya/frame/execsql/service/ExecSqlServiceImpl.java

@@ -53,7 +53,7 @@ public class ExecSqlServiceImpl implements IExecSqlService {
     public List<HashMap<String, Object>> execSelectSql(ExecSqlEntity entity) throws RuntimeException {
         List<HashMap<String, Object>> list = new ArrayList<>();
         logger.info("=============进入execSelectSql方法============");
-        if (null != entity && ObjectUtils.isEmpty(entity.getSql())) {
+        if (null != entity && null!=entity.getSql()) {
             //sqlsession
 //            SqlSession sqlSession = getSqlSession(entity.getDatasource_code());
 //            SqlSession sqlSession = new DataSourceUtil().getDefaultSqlSession();
@@ -61,7 +61,7 @@ public class ExecSqlServiceImpl implements IExecSqlService {
             logger.info("=============execSelectSql方法要执行的sql：============" + select_sql);
             if (!select_sql.contains("update") && !select_sql.contains("delete")
                     && !select_sql.contains("insert") && !select_sql.contains("create")) {
-                list = sqlSession.selectList("com.hzya.frame.sysnew.execsql.entity.ExecSqlEntity.ExecSqlEntity_execsql", entity);
+                list = sqlSession.selectList("com.hzya.frame.execsql.entity.ExecSqlEntity.ExecSqlEntity_execsql", entity);
                 logger.info("===========execSelectSql方法返回的结果条数=============" + list.size());
             }
             //sqlSession.close();

service/src/main/java/com/hzya/frame/mdm/entity/DbFiledsDto.java

@@ -8,7 +8,7 @@ import java.util.List;
 public class DbFiledsDto   {
 
     /**
-     * 1\修改 2、新增
+     * 1新增 2、修改
      */
     private String dataType;
 

service/src/main/java/com/hzya/frame/mdm/entity/MdmDbFiledVo.java

@@ -1,10 +1,5 @@
 package com.hzya.frame.mdm.entity;
 
-import com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity;
-import com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity;
-import com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.entity.MdmModuleDbFiledsRuleFilesEntity;
-
-import java.util.List;
 
 public class MdmDbFiledVo {
     private String id;

service/src/main/java/com/hzya/frame/mdm/entity/MdmDbVo.java

@@ -1,25 +1,19 @@
 package com.hzya.frame.mdm.entity;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity;
-import com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity;
-import com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.entity.MdmModuleDbFiledsRuleFilesEntity;
 import com.hzya.frame.mdm.mdmTableCodeRule.entity.MdmTableCodeRuleEntity;
-import org.springframework.format.annotation.DateTimeFormat;
 
-import java.util.Date;
 import java.util.List;
 
 public class MdmDbVo {
 
+    //单据编码规则
+    private List<MdmTableCodeRuleEntity> mdmTableCodeRuleEntityList;
     //主数据主表
     private MdmModuleDbEntity mainMdmModuleDb;
     //主数据子表
     private List<MdmModuleDbEntity> sublistMdmModuleDb;
-    //控件字段规则属性
-    private List<MdmModuleDbFiledsRuleFilesEntity> moduleDbFiledsRuleFiles;
-    //单据编码规则
-    private List<MdmTableCodeRuleEntity> mdmTableCodeRuleEntityList;
+
 
 
     public List<MdmTableCodeRuleEntity> getMdmTableCodeRuleEntityList() {
@@ -30,14 +24,6 @@ public class MdmDbVo {
         this.mdmTableCodeRuleEntityList = mdmTableCodeRuleEntityList;
     }
 
-    public List<MdmModuleDbFiledsRuleFilesEntity> getModuleDbFiledsRuleFiles() {
-        return moduleDbFiledsRuleFiles;
-    }
-
-    public void setModuleDbFiledsRuleFiles(List<MdmModuleDbFiledsRuleFilesEntity> moduleDbFiledsRuleFiles) {
-        this.moduleDbFiledsRuleFiles = moduleDbFiledsRuleFiles;
-    }
-
     public MdmModuleDbEntity getMainMdmModuleDb() {
         return mainMdmModuleDb;
     }

service/src/main/java/com/hzya/frame/mdm/entity/MdmDistributeDto.java

@@ -2,16 +2,13 @@ package com.hzya.frame.mdm.entity;
 
 
 import com.hzya.frame.mdm.mdmModuleDistribute.entity.MdmModuleDistributeEntity;
-import com.hzya.frame.mdm.mdmModuleRole.entity.MdmModuleRoleEntity;
-
 import java.util.List;
 
 public class MdmDistributeDto {
 
-    //id
-    private String id;
-
 
+    //主数据编码
+    private Long mdmCode;
 
     private List<MdmModuleDistributeEntity> mdmModuleDistributeEntities;
 
@@ -23,12 +20,12 @@ public class MdmDistributeDto {
         this.mdmModuleDistributeEntities = mdmModuleDistributeEntities;
     }
 
-    public String getId() {
-        return id;
+    public Long getMdmCode() {
+        return mdmCode;
     }
 
-    public void setId(String id) {
-        this.id = id;
+    public void setMdmCode(Long mdmCode) {
+        this.mdmCode = mdmCode;
     }
 }
 

service/src/main/java/com/hzya/frame/mdm/entity/MdmDistributeEntity.java

@@ -1,53 +0,0 @@
-package com.hzya.frame.mdm.entity;
-
-import com.hzya.frame.web.entity.BaseEntity;
-
-public class MdmDistributeEntity extends BaseEntity {
-
-    private String tableName;
-    private String formmainId;
-    private String appId;
-    private String status;//1、发送成功 2、发送中 3、发送失败 4、未发送
-    private String msg;
-
-    public String getTableName() {
-        return tableName;
-    }
-
-    public void setTableName(String tableName) {
-        this.tableName = tableName;
-    }
-
-    public String getFormmainId() {
-        return formmainId;
-    }
-
-    public void setFormmainId(String formmainId) {
-        this.formmainId = formmainId;
-    }
-
-    public String getAppId() {
-        return appId;
-    }
-
-    public void setAppId(String appId) {
-        this.appId = appId;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
-}
-

service/src/main/java/com/hzya/frame/mdm/entity/MdmDistributeVo.java

@@ -1,55 +0,0 @@
-package com.hzya.frame.mdm.entity;
-
-public class MdmDistributeVo {
-
-    /**
-     * 数据
-     */
-    private String formmainId;
-
-    /**
-     * 应用id
-     */
-    private String appId;
-    /**
-     * 状态  1、发送成功 2、发送中 3、发送失败 4、未发送
-     */
-    private String status;
-    /**
-     *描述
-     */
-    private String msg;
-
-    public String getFormmainId() {
-        return formmainId;
-    }
-
-    public void setFormmainId(String formmainId) {
-        this.formmainId = formmainId;
-    }
-
-    public String getAppId() {
-        return appId;
-    }
-
-    public void setAppId(String appId) {
-        this.appId = appId;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
-}
-

service/src/main/java/com/hzya/frame/mdm/entity/MdmDto.java

@@ -2,13 +2,22 @@ package com.hzya.frame.mdm.entity;
 
 
 import com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity;
-import com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity;
 import com.hzya.frame.mdm.mdmTableCodeRule.entity.MdmTableCodeRuleEntity;
 
 import java.util.List;
 
 public class MdmDto {
 
+    //主数据编码
+    private Long mdmCode;
+    //单据编码规则
+    private List<MdmTableCodeRuleEntity> mdmTableCodeRuleEntityList;
+    //主数据主表
+    private MdmModuleDbEntity mainMdmModuleDb;
+    //主数据子表
+    private List<MdmModuleDbEntity> sublistMdmModuleDb;
+
+
     //id
     private String id;
     //3、新增4、修改 5、查看
@@ -26,20 +35,12 @@ public class MdmDto {
     private String upIdFiled;
     //主数据名称
     private String mdmName;
-    //主数据编码
-    private Integer mdmCode;
     //主数据类型
     private String mdmType;
     //描述
     private String remark;
     //描述
     private String[] ids;
-    //单据编码规则
-    private List<MdmTableCodeRuleEntity> mdmTableCodeRuleEntityList;
-    //主数据主表
-    private MdmModuleDbEntity mainMdmModuleDb;
-    //主数据子表
-    private List<MdmModuleDbEntity> sublistMdmModuleDb;
 
     private String tableName;
     private String value;
@@ -49,21 +50,20 @@ public class MdmDto {
 
     private String upId;
 
-
-    public String getLableValue() {
-        return lableValue;
+    public Long getMdmCode() {
+        return mdmCode;
     }
 
-    public void setLableValue(String lableValue) {
-        this.lableValue = lableValue;
+    public void setMdmCode(Long mdmCode) {
+        this.mdmCode = mdmCode;
     }
 
-    public String getValue() {
-        return value;
+    public List<MdmTableCodeRuleEntity> getMdmTableCodeRuleEntityList() {
+        return mdmTableCodeRuleEntityList;
     }
 
-    public void setValue(String value) {
-        this.value = value;
+    public void setMdmTableCodeRuleEntityList(List<MdmTableCodeRuleEntity> mdmTableCodeRuleEntityList) {
+        this.mdmTableCodeRuleEntityList = mdmTableCodeRuleEntityList;
     }
 
     public MdmModuleDbEntity getMainMdmModuleDb() {
@@ -82,30 +82,6 @@ public class MdmDto {
         this.sublistMdmModuleDb = sublistMdmModuleDb;
     }
 
-    public String getMdmName() {
-        return mdmName;
-    }
-
-    public void setMdmName(String mdmName) {
-        this.mdmName = mdmName;
-    }
-
-    public Integer getMdmCode() {
-        return mdmCode;
-    }
-
-    public void setMdmCode(Integer mdmCode) {
-        this.mdmCode = mdmCode;
-    }
-
-    public String getMdmType() {
-        return mdmType;
-    }
-
-    public void setMdmType(String mdmType) {
-        this.mdmType = mdmType;
-    }
-
     public String getId() {
         return id;
     }
@@ -114,6 +90,14 @@ public class MdmDto {
         this.id = id;
     }
 
+    public String getShowType() {
+        return showType;
+    }
+
+    public void setShowType(String showType) {
+        this.showType = showType;
+    }
+
     public Integer getPageNum() {
         return pageNum;
     }
@@ -130,30 +114,6 @@ public class MdmDto {
         this.pageSize = pageSize;
     }
 
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getShowType() {
-        return showType;
-    }
-
-    public void setShowType(String showType) {
-        this.showType = showType;
-    }
-
-    public List<MdmTableCodeRuleEntity> getMdmTableCodeRuleEntityList() {
-        return mdmTableCodeRuleEntityList;
-    }
-
-    public void setMdmTableCodeRuleEntityList(List<MdmTableCodeRuleEntity> mdmTableCodeRuleEntityList) {
-        this.mdmTableCodeRuleEntityList = mdmTableCodeRuleEntityList;
-    }
-
     public String getViewFiled() {
         return viewFiled;
     }
@@ -170,6 +130,38 @@ public class MdmDto {
         this.upIdFiled = upIdFiled;
     }
 
+    public String getMdmName() {
+        return mdmName;
+    }
+
+    public void setMdmName(String mdmName) {
+        this.mdmName = mdmName;
+    }
+
+    public String getMdmType() {
+        return mdmType;
+    }
+
+    public void setMdmType(String mdmType) {
+        this.mdmType = mdmType;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String[] getIds() {
+        return ids;
+    }
+
+    public void setIds(String[] ids) {
+        this.ids = ids;
+    }
+
     public String getTableName() {
         return tableName;
     }
@@ -178,6 +170,14 @@ public class MdmDto {
         this.tableName = tableName;
     }
 
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
     public String getLabel() {
         return label;
     }
@@ -186,6 +186,14 @@ public class MdmDto {
         this.label = label;
     }
 
+    public String getLableValue() {
+        return lableValue;
+    }
+
+    public void setLableValue(String lableValue) {
+        this.lableValue = lableValue;
+    }
+
     public String getUpId() {
         return upId;
     }
@@ -193,13 +201,5 @@ public class MdmDto {
     public void setUpId(String upId) {
         this.upId = upId;
     }
-
-    public String[] getIds() {
-        return ids;
-    }
-
-    public void setIds(String[] ids) {
-        this.ids = ids;
-    }
 }
 

service/src/main/java/com/hzya/frame/mdm/entity/MdmModuleViewDto.java

@@ -1,14 +1,14 @@
 package com.hzya.frame.mdm.entity;
 
 import com.hzya.frame.mdm.mdmModuleView.entity.MdmModuleViewEntity;
+import com.hzya.frame.mdm.mdmModuleViewButton.entity.MdmModuleViewButtonEntity;
 import com.hzya.frame.mdm.mdmModuleViewDetail.entity.MdmModuleViewDetailEntity;
 
 import java.util.List;
 
 public class MdmModuleViewDto {
 
-    //id
-    private String id;
+    private Long mdmCode;
     //模版
     private MdmModuleViewEntity mdmModuleViewEntity;
     //新增
@@ -21,6 +21,8 @@ public class MdmModuleViewDto {
     private List<MdmDbFiledVo> queryFiled;
     //列表
     private List<MdmDbFiledVo> listFiled;
+    //按钮
+    private List<MdmModuleViewButtonEntity> dbButtonFiled;
 
     public MdmModuleViewEntity getMdmModuleViewEntity() {
         return mdmModuleViewEntity;
@@ -70,12 +72,20 @@ public class MdmModuleViewDto {
         this.listFiled = listFiled;
     }
 
-    public String getId() {
-        return id;
+    public Long getMdmCode() {
+        return mdmCode;
     }
 
-    public void setId(String id) {
-        this.id = id;
+    public void setMdmCode(Long mdmCode) {
+        this.mdmCode = mdmCode;
+    }
+
+    public List<MdmModuleViewButtonEntity> getDbButtonFiled() {
+        return dbButtonFiled;
+    }
+
+    public void setDbButtonFiled(List<MdmModuleViewButtonEntity> dbButtonFiled) {
+        this.dbButtonFiled = dbButtonFiled;
     }
 }
 

service/src/main/java/com/hzya/frame/mdm/entity/MdmModuleViewVo.java

@@ -1,6 +1,7 @@
 package com.hzya.frame.mdm.entity;
 
 import com.hzya.frame.mdm.mdmModuleView.entity.MdmModuleViewEntity;
+import com.hzya.frame.mdm.mdmModuleViewButton.entity.MdmModuleViewButtonEntity;
 import com.hzya.frame.mdm.mdmModuleViewDetail.entity.MdmModuleViewDetailEntity;
 
 import java.util.List;
@@ -31,6 +32,8 @@ public class MdmModuleViewVo {
     private List<MdmModuleViewDetailEntity> dbQueryFiled;
     //列表
     private List<MdmModuleViewDetailEntity> dbListFiled;
+    //按钮
+    private List<MdmModuleViewButtonEntity> dbButtonFiled;
 
     public List<MdmDbFiledVo> getAddFiled() {
         return addFiled;
@@ -119,5 +122,15 @@ public class MdmModuleViewVo {
     public void setDbListFiled(List<MdmModuleViewDetailEntity> dbListFiled) {
         this.dbListFiled = dbListFiled;
     }
+
+    public List<MdmModuleViewButtonEntity> getDbButtonFiled() {
+        return dbButtonFiled;
+    }
+
+    public void setDbButtonFiled(List<MdmModuleViewButtonEntity> dbButtonFiled) {
+        this.dbButtonFiled = dbButtonFiled;
+    }
+
+
 }
 

service/src/main/java/com/hzya/frame/mdm/entity/MdmRoleDto.java

@@ -1,32 +0,0 @@
-package com.hzya.frame.mdm.entity;
-
-
-import com.hzya.frame.mdm.mdmModuleRole.entity.MdmModuleRoleEntity;
-
-import java.util.List;
-
-public class MdmRoleDto {
-
-    //id
-    private String id;
-
-
-    private List<MdmModuleRoleEntity> mdmModuleRoleEntities;
-
-    public List<MdmModuleRoleEntity> getMdmModuleRoleEntities() {
-        return mdmModuleRoleEntities;
-    }
-
-    public void setMdmModuleRoleEntities(List<MdmModuleRoleEntity> mdmModuleRoleEntities) {
-        this.mdmModuleRoleEntities = mdmModuleRoleEntities;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-}
-

service/src/main/java/com/hzya/frame/mdm/entity/MdmSourceDto.java

@@ -0,0 +1,34 @@
+package com.hzya.frame.mdm.entity;
+
+
+import com.hzya.frame.mdm.mdmModuleDistribute.entity.MdmModuleDistributeEntity;
+import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity;
+
+import java.util.List;
+
+public class MdmSourceDto {
+
+
+    //主数据编码
+    private Long mdmCode;
+
+    private List<MdmModuleSourceEntity> mdmModuleSourceEntities;
+
+
+    public List<MdmModuleSourceEntity> getMdmModuleSourceEntities() {
+        return mdmModuleSourceEntities;
+    }
+
+    public void setMdmModuleSourceEntities(List<MdmModuleSourceEntity> mdmModuleSourceEntities) {
+        this.mdmModuleSourceEntities = mdmModuleSourceEntities;
+    }
+
+    public Long getMdmCode() {
+        return mdmCode;
+    }
+
+    public void setMdmCode(Long mdmCode) {
+        this.mdmCode = mdmCode;
+    }
+}
+

service/src/main/java/com/hzya/frame/mdm/entity/MdmViewButtonVo.java

@@ -1,34 +0,0 @@
-package com.hzya.frame.mdm.entity;
-
-public class MdmViewButtonVo {
-
-    //按钮类型
-    private String buttonType;
-    //按钮名
-    private String buttonName;
-
-    public String getButtonType() {
-        return buttonType;
-    }
-
-    public void setButtonType(String buttonType) {
-        this.buttonType = buttonType;
-    }
-
-    public String getButtonName() {
-        return buttonName;
-    }
-
-    public void setButtonName(String buttonName) {
-        this.buttonName = buttonName;
-    }
-
-    public MdmViewButtonVo() {
-    }
-
-    public MdmViewButtonVo(String buttonType, String buttonName) {
-        this.buttonType = buttonType;
-        this.buttonName = buttonName;
-    }
-}
-

service/src/main/java/com/hzya/frame/mdm/entity/MdmViewVo.java

@@ -19,8 +19,6 @@ public class MdmViewVo {
     private List<MdmViewFiledVo> queryList;
     //列表
     private List<MdmViewFiledVo> listList;
-    //按钮
-    private List<MdmViewButtonVo> buttonList;
 
     public List<MdmViewFiledVo> getQueryList() {
         return queryList;
@@ -38,13 +36,6 @@ public class MdmViewVo {
         this.listList = listList;
     }
 
-    public List<MdmViewButtonVo> getButtonList() {
-        return buttonList;
-    }
-
-    public void setButtonList(List<MdmViewButtonVo> buttonList) {
-        this.buttonList = buttonList;
-    }
 
     public String getId() {
         return id;

service/src/main/java/com/hzya/frame/mdm/entity/MdmVo.java

@@ -1,122 +0,0 @@
-package com.hzya.frame.mdm.entity;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-public class MdmVo {
-
-    //id
-    private String id;
-    //主数据名称
-    private String mdmName;
-    //主数据编码
-    private String mdmCode;
-    //主数据类型 1、档案 2、单据
-    private String mdmType;
-    //主数据类型 1、档案 2、单据
-    private String mdmTypeName;
-    //描述
-    private String remark;
-
-    /**  logo（地址或者id） */
-    private String mdmLogo;
-    private String createUserId;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    private String modifyUserId;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date modifyTime;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getMdmName() {
-        return mdmName;
-    }
-
-    public void setMdmName(String mdmName) {
-        this.mdmName = mdmName;
-    }
-
-    public String getMdmCode() {
-        return mdmCode;
-    }
-
-    public void setMdmCode(String mdmCode) {
-        this.mdmCode = mdmCode;
-    }
-
-    public String getMdmType() {
-        return mdmType;
-    }
-
-    public void setMdmType(String mdmType) {
-        this.mdmType = mdmType;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getMdmTypeName() {
-        return mdmTypeName;
-    }
-
-    public void setMdmTypeName(String mdmTypeName) {
-        this.mdmTypeName = mdmTypeName;
-    }
-
-    public String getCreateUserId() {
-        return createUserId;
-    }
-
-    public void setCreateUserId(String createUserId) {
-        this.createUserId = createUserId;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getModifyUserId() {
-        return modifyUserId;
-    }
-
-    public void setModifyUserId(String modifyUserId) {
-        this.modifyUserId = modifyUserId;
-    }
-
-    public Date getModifyTime() {
-        return modifyTime;
-    }
-
-    public void setModifyTime(Date modifyTime) {
-        this.modifyTime = modifyTime;
-    }
-
-    public String getMdmLogo() {
-        return mdmLogo;
-    }
-
-    public void setMdmLogo(String mdmLogo) {
-        this.mdmLogo = mdmLogo;
-    }
-}
-

service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java

@@ -1,14 +1,11 @@
 package com.hzya.frame.mdm.mdmModule.dao;
 
 import com.hzya.frame.mdm.entity.MdmDataDto;
-import com.hzya.frame.mdm.entity.MdmDistributeEntity;
 import com.hzya.frame.mdm.entity.MdmDto;
 import com.hzya.frame.mdm.entity.MdmQuery;
-import com.hzya.frame.mdm.entity.MdmVo;
 import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity;
 import com.hzya.frame.basedao.dao.IBaseDao;
 import com.hzya.frame.sys.entity.FormmainDeleteDto;
-import com.hzya.frame.sys.entity.ModuleDto;
 
 import java.util.HashMap;
 import java.util.List;
@@ -18,41 +15,29 @@ import java.util.Map;
  * 主数据模版(mdm_module: table)表数据库访问层
  *
  * @author makejava
- * @since 2023-10-17 15:25:41
+ * @since 2024-06-03 08:46:29
  */
 public interface IMdmModuleDao extends IBaseDao<MdmModuleEntity, String> {
 
-    List<MdmVo> queryMdm(MdmDto entity);
+    List<MdmModuleEntity> queryMdm(MdmModuleEntity entity);
+
+    MdmModuleEntity getByMdmCode(Long mdmCode);
 
     Integer checkTable(Map<String, String> maps);
-
     Integer createTable(Map<String, Object> maps);
-    Integer createTableDistribute(Map<String, Object> maps);
     Integer alterTable(Map<String, Object> maps);
     Integer alterTableName(Map<String, String> maps);
-
     List<HashMap<String, Object>> queryMdmShowData(MdmQuery entity);
-
+    List<HashMap<String, Object>> queryTemplateDataMore(MdmDto entity);
+    HashMap<String, Object> queryTemplateDataOne(MdmDto entity);
     Integer checkData(Map<String, String> map);
-
     Integer updateForm(MdmDataDto mdmDataDto);
     Integer saveForm(MdmDataDto mdmDataDto);
-
     Integer deleteTemplateById(FormmainDeleteDto formmainDeleteDto);
+    Integer deleteChilder(FormmainDeleteDto formmainDeleteDto);
+    List<HashMap<String, Object>> querySelectData(MdmDto entity);
 
     List<HashMap<String, Object>> queryDataAll(MdmDto entity);
 
-    List<HashMap<String, Object>> queryTemplateData(ModuleDto entity);
-
-    HashMap<String, Object> queryTemplateDataOne(MdmDto entity);
-
-    List<HashMap<String, Object>> queryTemplateDataMore(MdmDto entity);
-    List<HashMap<String, Object>> querySelectData(MdmDto entity);
-
-    Integer deleteChilder(FormmainDeleteDto formmainDeleteDto);
-
-    Integer saveDistribute(MdmDistributeEntity mdmDistributeEntity);
-
-    Integer updateDistribute(MdmDistributeEntity mdmDistributeEntity);
 }
 

service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java

@@ -1,14 +1,11 @@
 package com.hzya.frame.mdm.mdmModule.dao.impl;
 
 import com.hzya.frame.mdm.entity.MdmDataDto;
-import com.hzya.frame.mdm.entity.MdmDistributeEntity;
 import com.hzya.frame.mdm.entity.MdmDto;
 import com.hzya.frame.mdm.entity.MdmQuery;
-import com.hzya.frame.mdm.entity.MdmVo;
 import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity;
 import com.hzya.frame.mdm.mdmModule.dao.IMdmModuleDao;
 import com.hzya.frame.sys.entity.FormmainDeleteDto;
-import com.hzya.frame.sys.entity.ModuleDto;
 import org.springframework.stereotype.Repository;
 import com.hzya.frame.basedao.dao.MybatisGenericDao;
 
@@ -20,34 +17,94 @@ import java.util.Map;
  * 主数据模版(MdmModule)表数据库访问层
  *
  * @author makejava
- * @since 2023-10-17 15:25:42
+ * @since 2024-06-03 08:46:29
  */
 @Repository(value = "MdmModuleDaoImpl")
 public class MdmModuleDaoImpl extends MybatisGenericDao<MdmModuleEntity, String> implements IMdmModuleDao{
 
     @Override
-    public List<MdmVo> queryMdm(MdmDto entity) {
-        List<MdmVo> o = (List<MdmVo>) super.selectList(getSqlIdPrifx() + "queryMdm", entity);
+    public List<MdmModuleEntity> queryMdm(MdmModuleEntity entity) {
+        List<MdmModuleEntity> o = (List<MdmModuleEntity>) super.selectList(getSqlIdPrifx() + "queryMdm", entity);
         return o;
     }
 
 
 
+    @Override
+    public MdmModuleEntity getByMdmCode(Long mdmCode) {
+        MdmModuleEntity mdmModuleEntity = (MdmModuleEntity) super.selectOne(getSqlIdPrifx() + "getByMdmCode",mdmCode);
+        return mdmModuleEntity;
+    }
+
     @Override
     public Integer checkTable(Map<String, String> maps) {
         Integer o = (Integer) super.selectOne(getSqlIdPrifx() + "checkTable", maps);
         return o;
 
     }
-
     @Override
-    public Integer createTable(Map<String, Object> maps) {
-        Integer o = (Integer) super.selectOne(getSqlIdPrifx() + "createTable", maps);
+    public List<HashMap<String, Object>> queryDataAll(MdmDto entity) {
+        List<HashMap<String, Object>> o = (List<HashMap<String, Object>>) super.selectList(getSqlIdPrifx() + "queryDataAll", entity);
         return o;
     }
     @Override
-    public Integer createTableDistribute(Map<String, Object> maps) {
-        Integer o = (Integer) super.selectOne(getSqlIdPrifx() + "createTableDistribute", maps);
+    public Integer checkData(Map<String, String> maps) {
+        Integer o = (Integer) super.selectOne(getSqlIdPrifx() + "checkData", maps);
+        return o;
+
+    }
+    @Override
+    public Integer updateForm(MdmDataDto mdmDataDto) {
+        Integer o = super.update(getSqlIdPrifx() + "updateForm", mdmDataDto);
+        return o;
+
+    }
+    @Override
+    public List<HashMap<String, Object>> querySelectData(MdmDto entity) {
+        List<HashMap<String, Object>> o = (List<HashMap<String, Object>>) super.selectList(getSqlIdPrifx() + "querySelectData", entity);
+        return o;
+
+    }
+    @Override
+    public Integer deleteChilder(FormmainDeleteDto entity) {
+        Integer o = super.delete(getSqlIdPrifx() + "deleteChilder", entity);
+        return o;
+
+    }
+    @Override
+    public Integer deleteTemplateById(FormmainDeleteDto entity) {
+        Integer o = super.delete(getSqlIdPrifx() + "deleteTemplateById", entity);
+        return o;
+
+    }
+    @Override
+    public Integer saveForm(MdmDataDto mdmDataDto) {
+        Integer o = super.update(getSqlIdPrifx() + "saveForm", mdmDataDto);
+        return o;
+
+    }
+    @Override
+    public List<HashMap<String, Object>> queryTemplateDataMore(MdmDto entity) {
+        List<HashMap<String, Object>> o = (List<HashMap<String, Object>>) super.selectList(getSqlIdPrifx() + "queryTemplateDataMore", entity);
+        return o;
+
+    }
+
+    @Override
+    public HashMap<String, Object> queryTemplateDataOne(MdmDto entity) {
+        HashMap<String, Object> o = (HashMap<String, Object>) super.selectOne(getSqlIdPrifx() + "queryTemplateDataOne", entity);
+        return o;
+
+    }
+
+    @Override
+    public List<HashMap<String, Object>> queryMdmShowData(MdmQuery entity) {
+        List<HashMap<String, Object>> o = (List<HashMap<String, Object>>) super.selectList(getSqlIdPrifx() + "queryMdmShowData", entity);
+        return o;
+    }
+    @Override
+    public Integer createTable(Map<String, Object> maps) {
+        Integer o = (Integer) super.selectOne(getSqlIdPrifx() + "createTable", maps);
         return o;
     }
     @Override
@@ -62,86 +119,5 @@ public class MdmModuleDaoImpl extends MybatisGenericDao<MdmModuleEntity, String>
         return o;
 
     }
-    @Override
-    public Integer checkData(Map<String, String> maps) {
-        Integer o = (Integer) super.selectOne(getSqlIdPrifx() + "checkData", maps);
-        return o;
-
-    }
-    @Override
-    public List<HashMap<String, Object>> querySelectData(MdmDto entity) {
-        List<HashMap<String, Object>> o = (List<HashMap<String, Object>>) super.selectList(getSqlIdPrifx() + "querySelectData", entity);
-        return o;
-
-    }
-
-    @Override
-    public List<HashMap<String, Object>> queryTemplateDataMore(MdmDto entity) {
-        List<HashMap<String, Object>> o = (List<HashMap<String, Object>>) super.selectList(getSqlIdPrifx() + "queryTemplateDataMore", entity);
-        return o;
-
-    }
-
-    @Override
-    public List<HashMap<String, Object>> queryMdmShowData(MdmQuery entity) {
-        List<HashMap<String, Object>> o = (List<HashMap<String, Object>>) super.selectList(getSqlIdPrifx() + "queryMdmShowData", entity);
-        return o;
-    }
-    @Override
-    public List<HashMap<String, Object>> queryDataAll(MdmDto entity) {
-        List<HashMap<String, Object>> o = (List<HashMap<String, Object>>) super.selectList(getSqlIdPrifx() + "queryDataAll", entity);
-        return o;
-    }
-
-    @Override
-    public List<HashMap<String, Object>> queryTemplateData(ModuleDto entity) {
-        List<HashMap<String, Object>> o = (List<HashMap<String, Object>>) super.selectList(getSqlIdPrifx() + "queryTemplateData", entity);
-        return o;
-
-    }
-    @Override
-    public Integer updateForm(MdmDataDto mdmDataDto) {
-        Integer o = super.update(getSqlIdPrifx() + "updateForm", mdmDataDto);
-        return o;
-
-    }
-    @Override
-    public Integer saveForm(MdmDataDto mdmDataDto) {
-        Integer o = super.update(getSqlIdPrifx() + "saveForm", mdmDataDto);
-        return o;
-
-    }
-
-    @Override
-    public Integer deleteTemplateById(FormmainDeleteDto entity) {
-        Integer o = super.delete(getSqlIdPrifx() + "deleteTemplateById", entity);
-        return o;
-
-    }
-
-    @Override
-    public Integer deleteChilder(FormmainDeleteDto entity) {
-        Integer o = super.delete(getSqlIdPrifx() + "deleteChilder", entity);
-        return o;
-
-    }
-
-    @Override
-    public Integer saveDistribute(MdmDistributeEntity mdmDistributeEntity) {
-        Integer o = super.insert(getSqlIdPrifx() + "saveDistribute", mdmDistributeEntity);
-        return o;
-    }
-    @Override
-    public Integer updateDistribute(MdmDistributeEntity mdmDistributeEntity) {
-        Integer o = super.update(getSqlIdPrifx() + "updateDistribute", mdmDistributeEntity);
-        return o;
-    }
-
-    @Override
-    public HashMap<String, Object> queryTemplateDataOne(MdmDto entity) {
-        HashMap<String, Object> o = (HashMap<String, Object>) super.selectOne(getSqlIdPrifx() + "queryTemplateDataOne", entity);
-        return o;
-
-    }
 }
 

service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.java

@@ -1,36 +1,31 @@
 package com.hzya.frame.mdm.mdmModule.entity;
 
 import java.util.Date;
-
 import com.hzya.frame.web.entity.BaseEntity;
-
 /**
  * 主数据模版(MdmModule)实体类
  *
  * @author makejava
- * @since 2023-10-17 15:25:42
+ * @since 2024-06-03 08:46:29
  */
 public class MdmModuleEntity extends BaseEntity {
  
-
-    /**  logo（地址或者id） */
-    private String mdmLogo;
-    /**
-     * 主数据名称
-     */
+  /**  主数据名称 */
    private String mdmName;
-    /**
-     * 主数据编码
-     */
-    private Integer mdmCode;
-    /**
-     * 主数据类型 1、档案 2、单据
-     */
+  /**  logo */
+   private String mdmLogo;
+  /**  主数据编码 */
+   private Long mdmCode;
+  /**  主数据类型 1、档案 2、单据 */
    private String mdmType;
-    /**
-     * 描述
-     */
+  /**  描述 */
    private String remark;
+  /**  公司id */
+   private String companyId;
+   //创建人
+    private String createUser;
+    //修改人
+    private String modifyUser;
 
 
     public String getMdmName() {
@@ -41,11 +36,19 @@ public class MdmModuleEntity extends BaseEntity {
         this.mdmName = mdmName;
     }
 
-    public Integer getMdmCode() {
+    public String getMdmLogo() {
+        return mdmLogo;
+    }
+
+    public void setMdmLogo(String mdmLogo) {
+        this.mdmLogo = mdmLogo;
+    }
+
+    public Long getMdmCode() {
         return mdmCode;
     }
 
-    public void setMdmCode(Integer mdmCode) {
+    public void setMdmCode(Long mdmCode) {
         this.mdmCode = mdmCode;
     }
 
@@ -65,12 +68,28 @@ public class MdmModuleEntity extends BaseEntity {
         this.remark = remark;
     }
 
-    public String getMdmLogo() {
-        return mdmLogo;
+    public String getCompanyId() {
+        return companyId;
     }
 
-    public void setMdmLogo(String mdmLogo) {
-        this.mdmLogo = mdmLogo;
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getModifyUser() {
+        return modifyUser;
+    }
+
+    public void setModifyUser(String modifyUser) {
+        this.modifyUser = modifyUser;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
     }
 }
 

service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml

@@ -9,6 +9,8 @@
            <result property="mdmCode" column="mdm_code" jdbcType="INTEGER"/>
            <result property="mdmType" column="mdm_type" jdbcType="VARCHAR"/>
            <result property="remark" column="remark" jdbcType="VARCHAR"/>
+           <result property="createUser" column="createUser" jdbcType="VARCHAR"/>
+           <result property="modifyUser" column="modifyUser" 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"/>
@@ -16,6 +18,7 @@
            <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 = "MdmModuleEntity_Base_Column_List">
@@ -32,16 +35,16 @@
         ,modify_time 
         ,sts 
         ,org_id 
+        ,company_id 
      </sql>
     <!--通过ID获取数据 -->
     <select id="entity_get" resultMap="get-MdmModuleEntity-result">
         select
         <include refid="MdmModuleEntity_Base_Column_List" />
-        from mdm_module where sts = 'Y' and  id = #{id}
+        from mdm_module where id = #{ id } and sts='Y'
     </select>
  <!-- 查询 采用==查询 -->
-    <select id="entity_list_base" resultMap="get-MdmModuleEntity-result"
-            parameterType="com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity">
+ <select id="entity_list_base" resultMap="get-MdmModuleEntity-result" parameterType = "com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity">
     select
     <include refid="MdmModuleEntity_Base_Column_List" />
     from mdm_module
@@ -59,6 +62,7 @@
             <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>
@@ -82,6 +86,7 @@
             <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>
@@ -89,8 +94,7 @@
     </select>
 
     <!-- 分页查询列表 采用like格式 -->
-    <select id="entity_list_like" resultMap="get-MdmModuleEntity-result"
-            parameterType="com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity">
+<select id="entity_list_like" resultMap="get-MdmModuleEntity-result" parameterType = "com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity">
     select
     <include refid="MdmModuleEntity_Base_Column_List" />
     from mdm_module
@@ -102,16 +106,13 @@
             <if test="mdmType != null and mdmType != ''"> and mdm_type like concat('%',#{mdmType},'%') </if>
             <if test="remark != null and remark != ''"> and remark like concat('%',#{remark},'%') </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_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_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>
@@ -119,8 +120,7 @@
 </select>
 
 <!-- 查询列表 字段采用or格式 -->
-    <select id="MdmModuleentity_list_or" resultMap="get-MdmModuleEntity-result"
-            parameterType="com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity">
+<select id="MdmModuleentity_list_or" resultMap="get-MdmModuleEntity-result" parameterType = "com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity">
     select
     <include refid="MdmModuleEntity_Base_Column_List" />
     from mdm_module
@@ -138,6 +138,7 @@
               <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>
@@ -162,6 +163,7 @@
             <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(
@@ -180,27 +182,25 @@
             <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(mdm_name,mdm_logo, mdm_code, mdm_type, remark, sorts, create_user_id, create_time, modify_user_id,
-        modify_time, sts, org_id, sts)
+  insert into mdm_module(mdm_name, mdm_logo, mdm_code, mdm_type, remark, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id,  sts) 
     values
     <foreach collection="entities" item="entity" separator=",">
-            (#{entity.mdmName},#{entity.mdmLogo},#{entity.mdmCode},#{entity.mdmType},#{entity.remark},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},
-            'Y')
+    (#{entity.mdmName},#{entity.mdmLogo},#{entity.mdmCode},#{entity.mdmType},#{entity.remark},#{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(mdm_name, mdm_logo, mdm_code, mdm_type, remark, sorts, create_user_id, create_time, modify_user_id,
-        modify_time, sts, org_id)
+    insert into mdm_module(mdm_name, mdm_logo, mdm_code, mdm_type, remark, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id)
     values
     <foreach collection="entities" item="entity" separator=",">
-            (#{entity.mdmName},#{entity.mdmLogo},#{entity.mdmCode},#{entity.mdmType},#{entity.remark},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id})
+    (#{entity.mdmName},#{entity.mdmLogo},#{entity.mdmCode},#{entity.mdmType},#{entity.remark},#{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_name = values(mdm_name),
@@ -208,14 +208,13 @@
     mdm_code = values(mdm_code),
     mdm_type = values(mdm_type),
     remark = values(remark),
-        sorts = values(sorts),
     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)
-    </insert>
+    org_id = values(org_id),
+    company_id = values(company_id)</insert>
 <!--通过主键修改方法-->
 <update id="entity_update" parameterType = "com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity" >
 update mdm_module  set
@@ -225,13 +224,13 @@
   <if test="mdmCode != null"> mdm_code = #{mdmCode},</if>
   <if test="mdmType != null and mdmType != ''"> mdm_type = #{mdmType},</if>
   <if test="remark != null and remark != ''"> remark = #{remark},</if>
-            <if test="sorts != null">sorts = #{sorts},</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>
@@ -252,6 +251,7 @@ where id = #{id}
             <if test="remark != null and remark != ''"> and remark = #{remark} </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>
@@ -259,25 +259,21 @@ where id = #{id}
 <delete id="entity_delete">
     delete from mdm_module where id = #{id}
 </delete>
-
-
     <!-- 分页查询列表 采用like格式 -->
-    <select id="queryMdm" resultType="com.hzya.frame.mdm.entity.MdmVo" parameterType="com.hzya.frame.mdm.entity.MdmDto">
+    <select id="queryMdm" resultMap="get-MdmModuleEntity-result" parameterType = "com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity">
         select
         a.id as id,
-        a.mdm_name as mdmName,
-        a.mdm_logo as mdmLogo,
-        a.mdm_code as mdmCode,
-        a.mdm_type as mdmType,
-        sd.column_content as mdmTypeName,
+        a.mdm_name as mdm_name,
+        a.mdm_logo as mdm_logo,
+        a.mdm_code as mdm_code,
+        a.mdm_type as mdm_type,
         a.remark as remark,
-        a.create_time as createTime,
-        a.modify_time as modifyTime,
-        d.person_name as createUserId,
-        n.person_name as modifyUserId
+        a.create_time as create_time,
+        a.modify_time as modify_time,
+        d.person_name as createUser,
+        n.person_name as modifyUser
         from
         mdm_module a
-        LEFT JOIN sys_dictionaryshop_new sd on sd.column_value = a.mdm_type and sd.tab_name = 'mdm' and sd.column_name = 'mdm_type' and sd.used_sts = '1'
         LEFT JOIN sys_user c on c.id = a.create_user_id and c.sts = 'Y'
         LEFT JOIN sys_person d on d.id = c.person_id and d.sts = 'Y'
         LEFT JOIN sys_user m on m.id = a.modify_user_id and m.sts = 'Y'
@@ -293,6 +289,12 @@ where id = #{id}
         order by a.sorts asc
     </select>
 
+    <!--通过ID获取数据 -->
+    <select id="getByMdmCode" resultMap="get-MdmModuleEntity-result">
+        select
+        <include refid="MdmModuleEntity_Base_Column_List" />
+        from mdm_module where mdm_code = #{ mdmCode } and sts='Y'
+    </select>
     <!--通过ID获取数据 -->
     <select id="checkTable" resultType="java.lang.Integer">
 		SELECT
@@ -304,14 +306,19 @@ where id = #{id}
 		and TABLE_NAME =  #{tableName}
 	</select>
 
+
+
     <select id="createTable" resultType="java.lang.Integer">
         CREATE TABLE ${tableName} (
-        `id` varchar(50) NOT NULL COMMENT '唯一标识码',
-        <if test="dbType  == '1'.toString()">
-            `document_rule` varchar(50) DEFAULT NULL COMMENT '单据规则',
-            `document_rule_num` bigint(50) DEFAULT NULL COMMENT '单据规则流水号',
-        </if>
         <foreach collection="databaseFields" item="item" index="index">
+            <choose>
+                <when test="item.enName  == 'id'.toString()">
+                    `id` varchar(50) NOT NULL COMMENT '唯一标识码',
+                </when>
+                <when test="item.enName  == 'sorts'.toString()">
+                    `sorts` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '排序',
+                </when>
+                <otherwise >
                     <choose>
                         <when test="item.filedType  == '1'.toString()">
                             ${item.enName} bigint(${item.filedLength}) DEFAULT NULL COMMENT #{item.chName},
@@ -326,38 +333,15 @@ where id = #{id}
                             ${item.enName} datetime DEFAULT NULL COMMENT #{item.chName},
                         </when>
                     </choose>
+                </otherwise>
+            </choose>
         </foreach>
-        `sorts` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '排序',
-        `create_user_id` varchar(50) DEFAULT NULL COMMENT '创建人id',
-        `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-        `modify_user_id` varchar(50) DEFAULT NULL COMMENT '修改人id',
-        `modify_time` datetime DEFAULT NULL COMMENT '修改时间',
-        `sts` varchar(1) DEFAULT NULL COMMENT '状态(Y正常N删除)',
-        `org_id` varchar(50) DEFAULT NULL COMMENT '组织机构ID',
-        `company_id` varchar(50) DEFAULT NULL COMMENT '公司id',
         PRIMARY KEY (`sorts`,`id`) USING BTREE
-        ) ENGINE = INNODB DEFAULT CHARSET = utf8 COMMENT = #{tableRemark}
+        ) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COMMENT = #{tableRemark}
     </select>
 
 
-    <select id="createTableDistribute" resultType="java.lang.Integer">
-        CREATE TABLE ${tableName} (
-        `id` varchar(50) NOT NULL COMMENT '唯一标识码',
-        `formmain_id` varchar(50) DEFAULT NULL COMMENT '数据id',
-        `app_id` varchar(50) DEFAULT NULL COMMENT '应用id',
-        `status` varchar(50) DEFAULT NULL COMMENT '状态',
-        `msg` varchar(50) DEFAULT NULL COMMENT '描述',
-          `sorts` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '排序',
-          `create_user_id` varchar(50) DEFAULT NULL COMMENT '创建人id',
-          `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-          `modify_user_id` varchar(50) DEFAULT NULL COMMENT '修改人id',
-          `modify_time` datetime DEFAULT NULL COMMENT '修改时间',
-          `sts` varchar(1) DEFAULT NULL COMMENT '状态(Y正常N删除)',
-          `org_id` varchar(50) DEFAULT NULL COMMENT '组织机构ID',
-          `company_id` varchar(50) DEFAULT NULL COMMENT '公司id',
-          PRIMARY KEY (`sorts`,`id`) USING BTREE
-        ) ENGINE = INNODB DEFAULT CHARSET = utf8 COMMENT = #{tableRemark}
-    </select>
+
 
     <!--通过ID获取数据 -->
     <select id="alterTable" resultType="java.lang.Integer">
@@ -420,28 +404,12 @@ where id = #{id}
     <select id="alterTableName" resultType="java.lang.Integer">
 			ALTER TABLE ${tableName} COMMENT = #{tableRemark}
 	</select>
-    <!-- 查询符合条件的数量 -->
-    <select id="checkData" resultType="Integer" >
-        SELECT
-        count(*)
-        from
-        ${tableName}
-        <trim prefix="where" prefixOverrides="and">
-            <if test="filedName != null and filedName !='' and filedValue != null and filedValue !='' ">
-                and ${filedName} = #{filedValue}
-            </if>
-
-            <if test="id != null and id !='' ">and id != #{id}</if>
-            and sts = 'Y'
-        </trim>
-    </select>
 
     <!-- 分页查询列表 采用like格式 -->
     <select id="queryMdmShowData" resultType="java.util.HashMap"
             parameterType="com.hzya.frame.mdm.entity.MdmQuery">
         select
         <if test="returnField != null and returnField.size>0">
-            (SELECT count(*) from ${tableName}_distribute  WHERE sts = 'Y' and status = '1' and  formmain_id = a.id) as qwqwasdasdzxasda,
             <trim suffixOverrides=",">
                 <foreach collection="returnField" item="returnField">
                     a.${returnField} as ${returnField} ,
@@ -449,7 +417,6 @@ where id = #{id}
             </trim>
         </if>
         <if test="returnField == null or returnField.size == 0">
-            (SELECT count(*) from ${tableName}_distribute  WHERE sts = 'Y' and status = '1' and  formmain_id = a.id) as qwqwasdasdzxasda,
             a.*
         </if>
         from ${tableName} a
@@ -481,7 +448,85 @@ where id = #{id}
         </trim>
         order by a.sorts asc
     </select>
+    <!-- 分页查询列表 采用like格式 -->
+    <select id="queryTemplateDataMore" resultType="java.util.HashMap"
+            parameterType="com.hzya.frame.mdm.entity.MdmDto">
+        select
+        ${value} as id,
+        ${label} as label,
+        ${upId} as upID
+        from ${tableName}
+        <trim prefix="where" prefixOverrides="and">
+            <if test="ids != null and ids.length >0">
+                and id in (
+                <trim suffix="" suffixOverrides=",">
+                    <foreach collection="ids" item="item" index="index">
+                        #{item},
+                    </foreach>
+                </trim>
+                )
+            </if>
+            and sts = 'Y'
+        </trim>
+        order by sorts asc
+    </select>
+    <!-- 分页查询列表 采用like格式 -->
+    <select id="queryTemplateDataOne" resultType="java.util.HashMap"
+            parameterType="com.hzya.frame.mdm.entity.MdmDto">
+        select
+        ${value} as id,
+        ${label} as label,
+        ${upId} as upID
+        from ${tableName}
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id !='' ">and id = #{id}</if>
+            and sts = 'Y'
+        </trim>
+        order by sorts asc
+    </select>
+    <!-- 分页查询列表 采用like格式 -->
+    <select id="queryDataAll" resultType="java.util.HashMap"
+            parameterType="com.hzya.frame.mdm.entity.MdmDto">
+		select
+		id as qsdfg,
+		${label},
+		${upId}
+		from ${tableName}
+		where sts = 'Y'
+		order by sorts asc
+	</select>
+    <!-- 查询符合条件的数量 -->
+    <select id="checkData" resultType="Integer" >
+        SELECT
+        count(*)
+        from
+        ${tableName}
+        <trim prefix="where" prefixOverrides="and">
+            <if test="filedName != null and filedName !='' and filedValue != null and filedValue !='' ">
+                and ${filedName} = #{filedValue}
+            </if>
 
+            <if test="id != null and id !='' ">and id != #{id}</if>
+            and sts = 'Y'
+        </trim>
+    </select>
+    <update id="updateForm" parameterType="com.hzya.frame.mdm.entity.MdmDataDto">
+        update ${tableName} set
+        <trim suffix="" suffixOverrides=",">
+            <if test="mdmDataFiledDtos != null and mdmDataFiledDtos.size>0">
+                <foreach collection="mdmDataFiledDtos" item="item" index="index">
+                    <if test="item.filedsName != 'logid'.toString() ">
+                        ${item.filedsName} = #{item.filedsValue},
+                    </if>
+                    <if test="item.filedsName == 'logid'.toString() ">
+                        modify_user_id = #{item.filedsValue},
+                    </if>
+                </foreach>
+            </if>
+            modify_time = now(),
+        </trim>
+        where id = #{id}
+    </update>
 
     <insert id="saveForm" parameterType="com.hzya.frame.mdm.entity.MdmDataDto">
         insert into ${tableName}(
@@ -497,7 +542,6 @@ where id = #{id}
                     </if>
                 </foreach>
             </if>
-            sorts,
             create_time,
             modify_time,
             sts,
@@ -520,8 +564,7 @@ where id = #{id}
                     </if>
                 </foreach>
             </if>
-            (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from ${tableName} a WHERE
-            a.sts = 'Y' ),
+
             now(),
             now(),
             'Y',
@@ -578,24 +621,6 @@ where id = #{id}
         </trim>
         )
     </insert>
-    <update id="updateForm" parameterType="com.hzya.frame.mdm.entity.MdmDataDto">
-        update ${tableName} set
-        <trim suffix="" suffixOverrides=",">
-            <if test="mdmDataFiledDtos != null and mdmDataFiledDtos.size>0">
-                <foreach collection="mdmDataFiledDtos" item="item" index="index">
-                    <if test="item.filedsName != 'logid'.toString() ">
-                        ${item.filedsName} = #{item.filedsValue},
-                    </if>
-                    <if test="item.filedsName == 'logid'.toString() ">
-                        modify_user_id = #{item.filedsValue},
-                    </if>
-                </foreach>
-            </if>
-            modify_time = now(),
-        </trim>
-        where id = #{id}
-    </update>
-
     <update id="deleteTemplateById" parameterType="com.hzya.frame.sys.entity.FormmainDeleteDto">
         update ${tableName} set
         sts='N',modify_time = now(),modify_user_id = #{loginId}
@@ -606,7 +631,6 @@ where id = #{id}
         </trim>
     </update>
 
-
     <update id="deleteChilder" parameterType="com.hzya.frame.sys.entity.FormmainDeleteDto">
         update ${tableName} set
         sts='N',modify_time = now(),modify_user_id = #{loginId}
@@ -618,70 +642,6 @@ where id = #{id}
         </trim>
     </update>
 
-    <!-- 分页查询列表 采用like格式 -->
-    <select id="queryDataAll" resultType="java.util.HashMap"
-            parameterType="com.hzya.frame.mdm.entity.MdmDto">
-		select
-		id as qsdfg,
-		${label},
-		${upId}
-		from ${tableName}
-		where sts = 'Y'
-		order by sorts asc
-	</select>
-
-    <!-- 分页查询列表 采用like格式 -->
-    <select id="queryTemplateData" resultType="java.util.HashMap" parameterType="com.hzya.frame.sys.entity.ModuleDto">
-        select
-        ${value},
-        ${label}
-        from ${tableName}
-        <trim prefix="where" prefixOverrides="and">
-            <if test="id != null and id !='' ">and ${value} = #{id}</if>
-            <if test="lableValue != null and lableValue !='' ">and ${label} like concat('%',#{lableValue},'%')</if>
-            and sts = 'Y'
-        </trim>
-        order by sorts asc
-    </select>
-
-
-    <!-- 分页查询列表 采用like格式 -->
-    <select id="queryTemplateDataOne" resultType="java.util.HashMap"
-            parameterType="com.hzya.frame.mdm.entity.MdmDto">
-        select
-        ${value} as id,
-        ${label} as label,
-        ${upId} as upID
-        from ${tableName}
-        <trim prefix="where" prefixOverrides="and">
-            <if test="id != null and id !='' ">and id = #{id}</if>
-            and sts = 'Y'
-        </trim>
-        order by sorts asc
-    </select>
-    <!-- 分页查询列表 采用like格式 -->
-    <select id="queryTemplateDataMore" resultType="java.util.HashMap"
-            parameterType="com.hzya.frame.mdm.entity.MdmDto">
-        select
-        ${value} as id,
-        ${label} as label,
-        ${upId} as upID
-        from ${tableName}
-        <trim prefix="where" prefixOverrides="and">
-            <if test="ids != null and ids.length >0">
-                and id in (
-                <trim suffix="" suffixOverrides=",">
-                    <foreach collection="ids" item="item" index="index">
-                        #{item},
-                    </foreach>
-                </trim>
-                )
-            </if>
-            and sts = 'Y'
-        </trim>
-        order by sorts asc
-    </select>
-
     <!-- 分页查询列表 采用like格式 -->
     <select id="querySelectData" resultType="java.util.HashMap" parameterType="com.hzya.frame.mdm.entity.MdmDto">
         select
@@ -697,57 +657,5 @@ where id = #{id}
         order by sorts asc
     </select>
 
-    <insert id="saveDistribute" parameterType="com.hzya.frame.mdm.entity.MdmDistributeEntity" >
-        insert into ${tableName}(
-        <trim suffix="" suffixOverrides=",">
-            <if test="id != null and id != ''">id ,</if>
-            <if test="formmainId != null and formmainId != ''">formmain_id ,</if>
-            <if test="appId != null and appId != ''">app_id ,</if>
-            <if test="status != null and status != ''">status ,</if>
-            <if test="msg != null and msg != ''">msg ,</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="formmainId != null and formmainId != ''">#{formmainId} ,</if>
-            <if test="appId != null and appId != ''">#{appId} ,</if>
-            <if test="status != null and status != ''">#{status} ,</if>
-            <if test="msg != null and msg != ''">#{msg} ,</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>
-
-    <update id="updateDistribute" parameterType="com.hzya.frame.mdm.entity.MdmDistributeEntity">
-        update ${tableName} set
-        <trim suffix="" suffixOverrides=",">
-            <if test="formmainId != null and formmainId != ''">formmain_id = #{formmainId},</if>
-            <if test="appId != null and appId != ''">app_id = #{appId},</if>
-            <if test="status != null ">status = #{status},</if>
-            <if test="msg != null and msg != ''">msg = #{msg},</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>
-        </trim>
-        where id = #{id}
-    </update>
 </mapper>
 

service/src/main/java/com/hzya/frame/mdm/mdmModule/service/IMdmModuleService.java

@@ -2,12 +2,11 @@ package com.hzya.frame.mdm.mdmModule.service;
 
 import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity;
 import com.hzya.frame.basedao.service.IBaseService;
-
 /**
  * 主数据模版(MdmModule)表服务接口
  *
  * @author makejava
- * @since 2023-10-17 15:25:44
+ * @since 2024-06-03 08:46:29
  */
 public interface IMdmModuleService extends IBaseService<MdmModuleEntity, String>{
 }

service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java

@@ -5,16 +5,13 @@ import com.hzya.frame.mdm.mdmModule.dao.IMdmModuleDao;
 import com.hzya.frame.mdm.mdmModule.service.IMdmModuleService;
 import org.springframework.stereotype.Service; 
 import org.springframework.beans.factory.annotation.Autowired;
-
 import javax.annotation.Resource;
-
 import com.hzya.frame.basedao.service.impl.BaseService;
-
 /**
  * 主数据模版(MdmModule)表服务实现类
  *
  * @author makejava
- * @since 2023-10-17 15:25:44
+ * @since 2024-06-03 08:46:29
  */
 @Service(value = "mdmModuleService")
 public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> implements IMdmModuleService {

service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/dao/IMdmModuleDbDao.java

@@ -1,10 +1,7 @@
 package com.hzya.frame.mdm.mdmModuleDb.dao;
 
-import com.hzya.frame.mdm.entity.MdmDistributeVo;
-import com.hzya.frame.mdm.entity.MdmDto;
 import com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity;
 import com.hzya.frame.basedao.dao.IBaseDao;
-import com.hzya.frame.sys.entity.ModuleDto;
 
 import java.util.HashMap;
 import java.util.List;
@@ -14,16 +11,11 @@ import java.util.Map;
  * 模版数据库表(mdm_module_db: table)表数据库访问层
  *
  * @author makejava
- * @since 2023-10-17 15:26:49
+ * @since 2024-06-03 08:46:48
  */
 public interface IMdmModuleDbDao extends IBaseDao<MdmModuleDbEntity, String> {
-
     HashMap<String, Object> getServiceDataById(Map<String, Object> queryData);
-
     List<HashMap<String, Object>> getServiceByFormmainId(Map<String, Object> queryData);
     List<HashMap<String, Object>> getServiceByDistributeId(Map<String, Object> queryData);
-    List<MdmDistributeVo> getServiceByDistributeIdNoCase(Map<String, Object> queryData);
-
-
 }
 

service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/dao/impl/MdmModuleDbDaoImpl.java

@@ -1,10 +1,7 @@
 package com.hzya.frame.mdm.mdmModuleDb.dao.impl;
 
-import com.hzya.frame.mdm.entity.MdmDistributeVo;
-import com.hzya.frame.mdm.entity.MdmDto;
 import com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity;
 import com.hzya.frame.mdm.mdmModuleDb.dao.IMdmModuleDbDao;
-import com.hzya.frame.sys.entity.ModuleDto;
 import org.springframework.stereotype.Repository;
 import com.hzya.frame.basedao.dao.MybatisGenericDao;
 
@@ -16,11 +13,10 @@ import java.util.Map;
  * 模版数据库表(MdmModuleDb)表数据库访问层
  *
  * @author makejava
- * @since 2023-10-17 15:26:49
+ * @since 2024-06-03 08:46:50
  */
 @Repository(value = "MdmModuleDbDaoImpl")
 public class MdmModuleDbDaoImpl extends MybatisGenericDao<MdmModuleDbEntity, String> implements IMdmModuleDbDao{
-
     @Override
     public HashMap<String, Object> getServiceDataById(Map<String, Object> maps) {
         HashMap<String, Object> o = (HashMap<String, Object>) super.selectOne(getSqlIdPrifx() + "getServiceDataById", maps);
@@ -40,12 +36,6 @@ public class MdmModuleDbDaoImpl extends MybatisGenericDao<MdmModuleDbEntity, Str
         return o;
 
     }
-    @Override
-    public List<MdmDistributeVo> getServiceByDistributeIdNoCase(Map<String, Object> maps) {
-        List<MdmDistributeVo> o = (List<MdmDistributeVo>) super.selectList(getSqlIdPrifx() + "getServiceByDistributeIdNoCase", maps);
-        return o;
-
-    }
 
 }
 

service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.java

@@ -4,36 +4,31 @@ import java.util.Date;
 import java.util.List;
 
 import com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity;
+import com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity;
 import com.hzya.frame.web.entity.BaseEntity;
-
 /**
  * 模版数据库表(MdmModuleDb)实体类
  *
  * @author makejava
- * @since 2023-10-17 15:26:49
+ * @since 2024-06-03 08:46:50
  */
 public class MdmModuleDbEntity extends BaseEntity {
  
-    /**
-     * 主数据模版ID
-     */
+  /**  主数据模版ID */
    private String mdmId;
-    /**
-     * 表名
-     */
+  /**  表名 */
    private String dbName;
-    /**
-     * 类型 1、主表 2、明细
-     */
+  /**  类型 1、主表 2、明细 3、操作日志 4、下发日志 */
    private String dbType;
-    /**
-     * 备注
-     */
+  /**  备注 */
    private String remark;
-
-    //主数据子表字段
+  /**  公司id */
+   private String companyId;
+    /**  数据类型 1、新增 2、修改 */
+    private String dataType;
     private List<MdmModuleDbFiledsEntity> sublistMdmModuleDbFileds;
 
+
     public String getMdmId() {
         return mdmId;
     }
@@ -66,6 +61,14 @@ public class MdmModuleDbEntity extends BaseEntity {
         this.remark = remark;
     }
 
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
     public List<MdmModuleDbFiledsEntity> getSublistMdmModuleDbFileds() {
         return sublistMdmModuleDbFileds;
     }
@@ -73,5 +76,13 @@ public class MdmModuleDbEntity extends BaseEntity {
     public void setSublistMdmModuleDbFileds(List<MdmModuleDbFiledsEntity> sublistMdmModuleDbFileds) {
         this.sublistMdmModuleDbFileds = sublistMdmModuleDbFileds;
     }
+
+    public String getDataType() {
+        return dataType;
+    }
+
+    public void setDataType(String dataType) {
+        this.dataType = dataType;
+    }
 }
 

service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.xml

@@ -15,6 +15,7 @@
            <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 = "MdmModuleDbEntity_Base_Column_List">
@@ -30,10 +31,10 @@
         ,modify_time 
         ,sts 
         ,org_id 
+        ,company_id 
      </sql>
  <!-- 查询 采用==查询 -->
-    <select id="entity_list_base" resultMap="get-MdmModuleDbEntity-result"
-            parameterType="com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity">
+ <select id="entity_list_base" resultMap="get-MdmModuleDbEntity-result" parameterType = "com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity">
     select
     <include refid="MdmModuleDbEntity_Base_Column_List" />
     from mdm_module_db
@@ -50,6 +51,7 @@
             <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>
@@ -57,8 +59,7 @@
 </select>
     
 <!-- 查询符合条件的数量 -->
-    <select id="entity_count" resultType="Integer"
-            parameterType="com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity">
+<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity">
         select  count(1)   from mdm_module_db
     <trim prefix="where" prefixOverrides="and"> 
         <if test="id != null and id != ''"> and id = #{id} </if>
@@ -73,6 +74,7 @@
             <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>
@@ -80,8 +82,7 @@
     </select>
 
     <!-- 分页查询列表 采用like格式 -->
-    <select id="entity_list_like" resultMap="get-MdmModuleDbEntity-result"
-            parameterType="com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity">
+<select id="entity_list_like" resultMap="get-MdmModuleDbEntity-result" parameterType = "com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity">
     select
     <include refid="MdmModuleDbEntity_Base_Column_List" />
     from mdm_module_db
@@ -92,16 +93,13 @@
             <if test="dbType != null and dbType != ''"> and db_type like concat('%',#{dbType},'%') </if>
             <if test="remark != null and remark != ''"> and remark like concat('%',#{remark},'%') </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_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_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>
@@ -109,8 +107,7 @@
 </select>
 
 <!-- 查询列表 字段采用or格式 -->
-    <select id="MdmModuleDbentity_list_or" resultMap="get-MdmModuleDbEntity-result"
-            parameterType="com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity">
+<select id="MdmModuleDbentity_list_or" resultMap="get-MdmModuleDbEntity-result" parameterType = "com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity">
     select
     <include refid="MdmModuleDbEntity_Base_Column_List" />
     from mdm_module_db
@@ -127,6 +124,7 @@
               <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>
@@ -149,6 +147,7 @@
             <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(
@@ -165,42 +164,38 @@
             <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(mdm_id, db_name, db_type, remark, sorts, create_user_id, create_time, modify_user_id,
-        modify_time, sts, org_id, sts)
+  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) 
     values
     <foreach collection="entities" item="entity" separator=",">
-            (#{entity.mdmId},#{entity.dbName},#{entity.dbType},#{entity.remark},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},
-            'Y')
+    (#{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}, 'Y')
     </foreach>
 </insert>
 <!-- 批量新增或者修改-->
 <insert id="entityInsertOrUpdateBatch"  >
-        insert into mdm_module_db(mdm_id, db_name, db_type, remark, sorts, create_user_id, create_time, modify_user_id,
-        modify_time, sts, org_id)
+    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)
     values
     <foreach collection="entities" item="entity" separator=",">
-            (#{entity.mdmId},#{entity.dbName},#{entity.dbType},#{entity.remark},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id})
+    (#{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})
     </foreach>
     on duplicate key update
     mdm_id = values(mdm_id),
     db_name = values(db_name),
     db_type = values(db_type),
     remark = values(remark),
-        sorts = values(sorts),
     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)
-    </insert>
+    org_id = values(org_id),
+    company_id = values(company_id)</insert>
 <!--通过主键修改方法-->
 <update id="entity_update" parameterType = "com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity" >
 update mdm_module_db  set
@@ -209,13 +204,13 @@
   <if test="dbName != null and dbName != ''"> db_name = #{dbName},</if>
   <if test="dbType != null and dbType != ''"> db_type = #{dbType},</if>
   <if test="remark != null and remark != ''"> remark = #{remark},</if>
-            <if test="sorts != null">sorts = #{sorts},</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>
@@ -225,8 +220,7 @@ update mdm_module_db  set sts= 'N' ,modify_time = #{modify_time},modify_user_id
 where id = #{id}
 </update>
 <!-- 多条件逻辑删除 -->
-    <update id="entity_logicDelete_Multi_Condition"
-            parameterType="com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity">
+<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity" >
 update mdm_module_db  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>
@@ -236,6 +230,7 @@ where id = #{id}
             <if test="remark != null and remark != ''"> and remark = #{remark} </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>
@@ -304,19 +299,5 @@ where id = #{id}
         order by sorts asc
     </select>
 
-    <!-- 分页查询列表 采用like格式 -->
-    <select id="getServiceByDistributeIdNoCase" resultType="com.hzya.frame.mdm.entity.MdmDistributeVo" parameterType="java.util.HashMap">
-        select
-        formmain_id as formmainId,
-        app_id as appId,
-        status,
-        msg
-        from ${tableName}
-        <trim prefix="where" prefixOverrides="and">
-            and formmain_id = #{id}
-            and sts = 'Y'
-        </trim>
-        order by sorts asc
-    </select>
 </mapper>
 

service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/service/IMdmModuleDbService.java

@@ -2,12 +2,11 @@ package com.hzya.frame.mdm.mdmModuleDb.service;
 
 import com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity;
 import com.hzya.frame.basedao.service.IBaseService;
-
 /**
  * 模版数据库表(MdmModuleDb)表服务接口
  *
  * @author makejava
- * @since 2023-10-17 15:26:51
+ * @since 2024-06-03 08:46:51
  */
 public interface IMdmModuleDbService extends IBaseService<MdmModuleDbEntity, String>{
 }

service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/service/impl/MdmModuleDbServiceImpl.java

@@ -5,16 +5,13 @@ import com.hzya.frame.mdm.mdmModuleDb.dao.IMdmModuleDbDao;
 import com.hzya.frame.mdm.mdmModuleDb.service.IMdmModuleDbService;
 import org.springframework.stereotype.Service; 
 import org.springframework.beans.factory.annotation.Autowired;
-
 import javax.annotation.Resource;
-
 import com.hzya.frame.basedao.service.impl.BaseService;
-
 /**
  * 模版数据库表(MdmModuleDb)表服务实现类
  *
  * @author makejava
- * @since 2023-10-17 15:26:51
+ * @since 2024-06-03 08:46:52
  */
 @Service(value = "mdmModuleDbService")
 public class MdmModuleDbServiceImpl extends BaseService<MdmModuleDbEntity, String> implements IMdmModuleDbService {

service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/dao/IMdmModuleDbFiledsDao.java

@@ -7,7 +7,7 @@ import com.hzya.frame.basedao.dao.IBaseDao;
  * 模版数据库字段表(mdm_module_db_fileds: table)表数据库访问层
  *
  * @author makejava
- * @since 2023-10-17 15:28:06
+ * @since 2024-06-03 08:47:01
  */
 public interface IMdmModuleDbFiledsDao extends IBaseDao<MdmModuleDbFiledsEntity, String> {
 

service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/dao/impl/MdmModuleDbFiledsDaoImpl.java

@@ -4,12 +4,11 @@ import com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity;
 import com.hzya.frame.mdm.mdmModuleDbFileds.dao.IMdmModuleDbFiledsDao;
 import org.springframework.stereotype.Repository;
 import com.hzya.frame.basedao.dao.MybatisGenericDao;
-
 /**
  * 模版数据库字段表(MdmModuleDbFileds)表数据库访问层
  *
  * @author makejava
- * @since 2023-10-17 15:28:07
+ * @since 2024-06-03 08:47:01
  */
 @Repository(value = "MdmModuleDbFiledsDaoImpl")
 public class MdmModuleDbFiledsDaoImpl extends MybatisGenericDao<MdmModuleDbFiledsEntity, String> implements IMdmModuleDbFiledsDao{

service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java

@@ -5,39 +5,42 @@ import java.util.List;
 
 import com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity;
 import com.hzya.frame.web.entity.BaseEntity;
-
 /**
  * 模版数据库字段表(MdmModuleDbFileds)实体类
  *
  * @author makejava
- * @since 2023-10-17 15:28:07
+ * @since 2024-06-03 08:47:01
  */
 public class MdmModuleDbFiledsEntity extends BaseEntity {
  
-    /**
-     * 主数据模版ID
-     */
+  /**  主数据模版ID */
    private String mdmId;
-    /**
-     * 模版数据库id
-     */
+  /**  模版数据库id */
    private String dbId;
-    /**
-     * 中文名
-     */
+  /**  中文名 */
    private String chName;
-    /**
-     * 英文名
-     */
+  /**  英文名 */
    private String enName;
-    /**
-     * 字段类型 1、BIGINT 2、DECIMAL 3、VARCHAR 4、DATETIME
-     */
+  /**  字段类型 1、BIGINT 2、DECIMAL 3、VARCHAR 4、DATETIME */
    private String filedType;
-    /**
-     * 长度
-     */
+  /**  显示类型：新增 */
+   private String addType;
+  /**  显示类型：修改 */
+   private String updateType;
+  /**  显示类型：查看 */
+   private String showType;
+  /**  显示类型：查询 */
+   private String queryType;
+  /**  显示类型：列表 */
+   private String listType;
+  /**  显示类型：显示 */
+   private String viewType;
+  /**  长度 */
    private String filedLength;
+  /**  公司id */
+   private String companyId;
+    /**  数据类型 1、新增 2、修改 */
+    private String dataType;
     /**
      * roletype
      */
@@ -46,17 +49,8 @@ public class MdmModuleDbFiledsEntity extends BaseEntity {
      * roletype
      */
     private String roleValue;
-    //字段规则
    private List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRules;
 
-    public List<MdmModuleDbFiledsRuleEntity> getMdmModuleDbFiledsRules() {
-        return mdmModuleDbFiledsRules;
-    }
-
-    public void setMdmModuleDbFiledsRules(List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRules) {
-        this.mdmModuleDbFiledsRules = mdmModuleDbFiledsRules;
-    }
-
     public String getMdmId() {
         return mdmId;
     }
@@ -97,6 +91,54 @@ public class MdmModuleDbFiledsEntity extends BaseEntity {
         this.filedType = filedType;
     }
 
+    public String getAddType() {
+        return addType;
+    }
+
+    public void setAddType(String addType) {
+        this.addType = addType;
+    }
+
+    public String getUpdateType() {
+        return updateType;
+    }
+
+    public void setUpdateType(String updateType) {
+        this.updateType = updateType;
+    }
+
+    public String getShowType() {
+        return showType;
+    }
+
+    public void setShowType(String showType) {
+        this.showType = showType;
+    }
+
+    public String getQueryType() {
+        return queryType;
+    }
+
+    public void setQueryType(String queryType) {
+        this.queryType = queryType;
+    }
+
+    public String getListType() {
+        return listType;
+    }
+
+    public void setListType(String listType) {
+        this.listType = listType;
+    }
+
+    public String getViewType() {
+        return viewType;
+    }
+
+    public void setViewType(String viewType) {
+        this.viewType = viewType;
+    }
+
     public String getFiledLength() {
         return filedLength;
     }
@@ -105,6 +147,30 @@ public class MdmModuleDbFiledsEntity extends BaseEntity {
         this.filedLength = filedLength;
     }
 
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    public List<MdmModuleDbFiledsRuleEntity> getMdmModuleDbFiledsRules() {
+        return mdmModuleDbFiledsRules;
+    }
+
+    public void setMdmModuleDbFiledsRules(List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRules) {
+        this.mdmModuleDbFiledsRules = mdmModuleDbFiledsRules;
+    }
+
+    public String getDataType() {
+        return dataType;
+    }
+
+    public void setDataType(String dataType) {
+        this.dataType = dataType;
+    }
+
     public String getRoletype() {
         return roletype;
     }

service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.xml

@@ -2,14 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hzya.frame.mdm.mdmModuleDbFileds.dao.impl.MdmModuleDbFiledsDaoImpl">
 
-    <resultMap id="get-MdmModuleDbFiledsEntity-result"
-               type="com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity">
+    <resultMap id="get-MdmModuleDbFiledsEntity-result" type="com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity" >
        <result property="id" column="id" jdbcType="VARCHAR"/>
            <result property="mdmId" column="mdm_id" jdbcType="VARCHAR"/>
            <result property="dbId" column="db_id" jdbcType="VARCHAR"/>
            <result property="chName" column="ch_name" jdbcType="VARCHAR"/>
            <result property="enName" column="en_name" jdbcType="VARCHAR"/>
            <result property="filedType" column="filed_type" jdbcType="VARCHAR"/>
+           <result property="addType" column="add_type" jdbcType="VARCHAR"/>
+           <result property="updateType" column="update_type" jdbcType="VARCHAR"/>
+           <result property="showType" column="show_type" jdbcType="VARCHAR"/>
+           <result property="queryType" column="query_type" jdbcType="VARCHAR"/>
+           <result property="listType" column="list_type" jdbcType="VARCHAR"/>
+           <result property="viewType" column="view_type" jdbcType="VARCHAR"/>
            <result property="filedLength" column="filed_length" jdbcType="VARCHAR"/>
            <result property="sorts" column="sorts" jdbcType="INTEGER"/>
            <result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
@@ -18,6 +23,7 @@
            <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 = "MdmModuleDbFiledsEntity_Base_Column_List">
@@ -27,6 +33,12 @@
         ,ch_name 
         ,en_name 
         ,filed_type 
+        ,add_type 
+        ,update_type 
+        ,show_type 
+        ,query_type 
+        ,list_type 
+        ,view_type 
         ,filed_length 
         ,sorts 
         ,create_user_id 
@@ -35,10 +47,10 @@
         ,modify_time 
         ,sts 
         ,org_id 
+        ,company_id 
      </sql>
  <!-- 查询 采用==查询 -->
-    <select id="entity_list_base" resultMap="get-MdmModuleDbFiledsEntity-result"
-            parameterType="com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity">
+ <select id="entity_list_base" resultMap="get-MdmModuleDbFiledsEntity-result" parameterType = "com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity">
     select
     <include refid="MdmModuleDbFiledsEntity_Base_Column_List" />
     from mdm_module_db_fileds
@@ -49,6 +61,12 @@
             <if test="chName != null and chName != ''"> and ch_name = #{chName} </if>
             <if test="enName != null and enName != ''"> and en_name = #{enName} </if>
             <if test="filedType != null and filedType != ''"> and filed_type = #{filedType} </if>
+            <if test="addType != null and addType != ''"> and add_type = #{addType} </if>
+            <if test="updateType != null and updateType != ''"> and update_type = #{updateType} </if>
+            <if test="showType != null and showType != ''"> and show_type = #{showType} </if>
+            <if test="queryType != null and queryType != ''"> and query_type = #{queryType} </if>
+            <if test="listType != null and listType != ''"> and list_type = #{listType} </if>
+            <if test="viewType != null and viewType != ''"> and view_type = #{viewType} </if>
             <if test="filedLength != null and filedLength != ''"> and filed_length = #{filedLength} </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>
@@ -57,14 +75,7 @@
             <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="roletype != null and roletype != ''">
-                and id in (
-                select
-                filed_id
-                from mdm_module_db_fileds_rule
-                where sts='Y'	and rule_code = #{roletype} and rule_value =  #{roleValue}
-                )
-            </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>
@@ -72,8 +83,7 @@
 </select>
     
 <!-- 查询符合条件的数量 -->
-    <select id="entity_count" resultType="Integer"
-            parameterType="com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity">
+<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity">
         select  count(1)   from mdm_module_db_fileds
     <trim prefix="where" prefixOverrides="and"> 
         <if test="id != null and id != ''"> and id = #{id} </if>
@@ -82,6 +92,12 @@
             <if test="chName != null and chName != ''"> and ch_name = #{chName} </if>
             <if test="enName != null and enName != ''"> and en_name = #{enName} </if>
             <if test="filedType != null and filedType != ''"> and filed_type = #{filedType} </if>
+            <if test="addType != null and addType != ''"> and add_type = #{addType} </if>
+            <if test="updateType != null and updateType != ''"> and update_type = #{updateType} </if>
+            <if test="showType != null and showType != ''"> and show_type = #{showType} </if>
+            <if test="queryType != null and queryType != ''"> and query_type = #{queryType} </if>
+            <if test="listType != null and listType != ''"> and list_type = #{listType} </if>
+            <if test="viewType != null and viewType != ''"> and view_type = #{viewType} </if>
             <if test="filedLength != null and filedLength != ''"> and filed_length = #{filedLength} </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>
@@ -90,6 +106,7 @@
             <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>
@@ -97,8 +114,7 @@
     </select>
 
     <!-- 分页查询列表 采用like格式 -->
-    <select id="entity_list_like" resultMap="get-MdmModuleDbFiledsEntity-result"
-            parameterType="com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity">
+<select id="entity_list_like" resultMap="get-MdmModuleDbFiledsEntity-result" parameterType = "com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity">
     select
     <include refid="MdmModuleDbFiledsEntity_Base_Column_List" />
     from mdm_module_db_fileds
@@ -109,19 +125,21 @@
             <if test="chName != null and chName != ''"> and ch_name like concat('%',#{chName},'%') </if>
             <if test="enName != null and enName != ''"> and en_name like concat('%',#{enName},'%') </if>
             <if test="filedType != null and filedType != ''"> and filed_type like concat('%',#{filedType},'%') </if>
-            <if test="filedLength != null and filedLength != ''">and filed_length like concat('%',#{filedLength},'%')
-            </if>
+            <if test="addType != null and addType != ''"> and add_type like concat('%',#{addType},'%') </if>
+            <if test="updateType != null and updateType != ''"> and update_type like concat('%',#{updateType},'%') </if>
+            <if test="showType != null and showType != ''"> and show_type like concat('%',#{showType},'%') </if>
+            <if test="queryType != null and queryType != ''"> and query_type like concat('%',#{queryType},'%') </if>
+            <if test="listType != null and listType != ''"> and list_type like concat('%',#{listType},'%') </if>
+            <if test="viewType != null and viewType != ''"> and view_type like concat('%',#{viewType},'%') </if>
+            <if test="filedLength != null and filedLength != ''"> and filed_length like concat('%',#{filedLength},'%') </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_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_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>
@@ -129,8 +147,7 @@
 </select>
 
 <!-- 查询列表 字段采用or格式 -->
-    <select id="MdmModuleDbFiledsentity_list_or" resultMap="get-MdmModuleDbFiledsEntity-result"
-            parameterType="com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity">
+<select id="MdmModuleDbFiledsentity_list_or" resultMap="get-MdmModuleDbFiledsEntity-result" parameterType = "com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity">
     select
     <include refid="MdmModuleDbFiledsEntity_Base_Column_List" />
     from mdm_module_db_fileds
@@ -141,6 +158,12 @@
              <if test="chName != null and chName != ''"> or ch_name = #{chName} </if>
              <if test="enName != null and enName != ''"> or en_name = #{enName} </if>
              <if test="filedType != null and filedType != ''"> or filed_type = #{filedType} </if>
+             <if test="addType != null and addType != ''"> or add_type = #{addType} </if>
+             <if test="updateType != null and updateType != ''"> or update_type = #{updateType} </if>
+             <if test="showType != null and showType != ''"> or show_type = #{showType} </if>
+             <if test="queryType != null and queryType != ''"> or query_type = #{queryType} </if>
+             <if test="listType != null and listType != ''"> or list_type = #{listType} </if>
+             <if test="viewType != null and viewType != ''"> or view_type = #{viewType} </if>
              <if test="filedLength != null and filedLength != ''"> or filed_length = #{filedLength} </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>
@@ -149,6 +172,7 @@
               <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>
@@ -156,8 +180,7 @@
 </select>
 
 <!--新增所有列-->
-    <insert id="entity_insert" parameterType="com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity"
-            >
+<insert id="entity_insert" parameterType = "com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity"  >
     insert into mdm_module_db_fileds(
   <trim suffix="" suffixOverrides=",">
        <if test="id != null and id != ''"> id , </if>
@@ -166,6 +189,12 @@
             <if test="chName != null and chName != ''"> ch_name , </if>
             <if test="enName != null and enName != ''"> en_name , </if>
             <if test="filedType != null and filedType != ''"> filed_type , </if>
+            <if test="addType != null and addType != ''"> add_type , </if>
+            <if test="updateType != null and updateType != ''"> update_type , </if>
+            <if test="showType != null and showType != ''"> show_type , </if>
+            <if test="queryType != null and queryType != ''"> query_type , </if>
+            <if test="listType != null and listType != ''"> list_type , </if>
+            <if test="viewType != null and viewType != ''"> view_type , </if>
             <if test="filedLength != null and filedLength != ''"> filed_length , </if>
             <if test="sorts != null"> sorts , </if>
             <if test="create_user_id != null and create_user_id != ''"> create_user_id , </if>
@@ -174,6 +203,7 @@
             <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(
@@ -184,6 +214,12 @@
             <if test="chName != null and chName != ''"> #{chName} ,</if>
             <if test="enName != null and enName != ''"> #{enName} ,</if>
             <if test="filedType != null and filedType != ''"> #{filedType} ,</if>
+            <if test="addType != null and addType != ''"> #{addType} ,</if>
+            <if test="updateType != null and updateType != ''"> #{updateType} ,</if>
+            <if test="showType != null and showType != ''"> #{showType} ,</if>
+            <if test="queryType != null and queryType != ''"> #{queryType} ,</if>
+            <if test="listType != null and listType != ''"> #{listType} ,</if>
+            <if test="viewType != null and viewType != ''"> #{viewType} ,</if>
             <if test="filedLength != null and filedLength != ''"> #{filedLength} ,</if>
             <if test="sorts != null"> #{sorts} ,</if>
             <if test="create_user_id != null and create_user_id != ''"> #{create_user_id} ,</if>
@@ -192,28 +228,25 @@
             <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(mdm_id, db_id, ch_name, en_name, filed_type, filed_length, sorts,
-        create_user_id, create_time, modify_user_id, modify_time, sts, org_id, sts)
+  insert into mdm_module_db_fileds(mdm_id, db_id, ch_name, en_name, filed_type, add_type, update_type, show_type, query_type, list_type, view_type, filed_length, 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.dbId},#{entity.chName},#{entity.enName},#{entity.filedType},#{entity.filedLength},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},
-            'Y')
+    (#{entity.mdmId},#{entity.dbId},#{entity.chName},#{entity.enName},#{entity.filedType},#{entity.addType},#{entity.updateType},#{entity.showType},#{entity.queryType},#{entity.listType},#{entity.viewType},#{entity.filedLength},#{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(mdm_id, db_id, ch_name, en_name, filed_type, filed_length, sorts,
-        create_user_id, create_time, modify_user_id, modify_time, sts, org_id)
+    insert into mdm_module_db_fileds(mdm_id, db_id, ch_name, en_name, filed_type, add_type, update_type, show_type, query_type, list_type, view_type, filed_length, 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.dbId},#{entity.chName},#{entity.enName},#{entity.filedType},#{entity.filedLength},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id})
+    (#{entity.mdmId},#{entity.dbId},#{entity.chName},#{entity.enName},#{entity.filedType},#{entity.addType},#{entity.updateType},#{entity.showType},#{entity.queryType},#{entity.listType},#{entity.viewType},#{entity.filedLength},#{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),
@@ -221,15 +254,20 @@
     ch_name = values(ch_name),
     en_name = values(en_name),
     filed_type = values(filed_type),
+    add_type = values(add_type),
+    update_type = values(update_type),
+    show_type = values(show_type),
+    query_type = values(query_type),
+    list_type = values(list_type),
+    view_type = values(view_type),
     filed_length = values(filed_length),
-        sorts = values(sorts),
     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)
-    </insert>
+    org_id = values(org_id),
+    company_id = values(company_id)</insert>
 <!--通过主键修改方法-->
 <update id="entity_update" parameterType = "com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity" >
 update mdm_module_db_fileds  set
@@ -239,14 +277,20 @@
   <if test="chName != null and chName != ''"> ch_name = #{chName},</if>
   <if test="enName != null and enName != ''"> en_name = #{enName},</if>
   <if test="filedType != null and filedType != ''"> filed_type = #{filedType},</if>
+  <if test="addType != null and addType != ''"> add_type = #{addType},</if>
+  <if test="updateType != null and updateType != ''"> update_type = #{updateType},</if>
+  <if test="showType != null and showType != ''"> show_type = #{showType},</if>
+  <if test="queryType != null and queryType != ''"> query_type = #{queryType},</if>
+  <if test="listType != null and listType != ''"> list_type = #{listType},</if>
+  <if test="viewType != null and viewType != ''"> view_type = #{viewType},</if>
   <if test="filedLength != null and filedLength != ''"> filed_length = #{filedLength},</if>
-            <if test="sorts != null">sorts = #{sorts},</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>
@@ -256,8 +300,7 @@ update mdm_module_db_fileds  set sts= 'N' ,modify_time = #{modify_time},modify_u
 where id = #{id}
 </update>
 <!-- 多条件逻辑删除 -->
-    <update id="entity_logicDelete_Multi_Condition"
-            parameterType="com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity">
+<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity" >
 update mdm_module_db_fileds  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>
@@ -266,9 +309,16 @@ where id = #{id}
             <if test="chName != null and chName != ''"> and ch_name = #{chName} </if>
             <if test="enName != null and enName != ''"> and en_name = #{enName} </if>
             <if test="filedType != null and filedType != ''"> and filed_type = #{filedType} </if>
+            <if test="addType != null and addType != ''"> and add_type = #{addType} </if>
+            <if test="updateType != null and updateType != ''"> and update_type = #{updateType} </if>
+            <if test="showType != null and showType != ''"> and show_type = #{showType} </if>
+            <if test="queryType != null and queryType != ''"> and query_type = #{queryType} </if>
+            <if test="listType != null and listType != ''"> and list_type = #{listType} </if>
+            <if test="viewType != null and viewType != ''"> and view_type = #{viewType} </if>
             <if test="filedLength != null and filedLength != ''"> and filed_length = #{filedLength} </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>

service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/service/IMdmModuleDbFiledsService.java

@@ -2,12 +2,11 @@ package com.hzya.frame.mdm.mdmModuleDbFileds.service;
 
 import com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity;
 import com.hzya.frame.basedao.service.IBaseService;
-
 /**
  * 模版数据库字段表(MdmModuleDbFileds)表服务接口
  *
  * @author makejava
- * @since 2023-10-17 15:28:09
+ * @since 2024-06-03 08:47:01
  */
 public interface IMdmModuleDbFiledsService extends IBaseService<MdmModuleDbFiledsEntity, String>{
 }

service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/service/impl/MdmModuleDbFiledsServiceImpl.java

@@ -5,16 +5,13 @@ import com.hzya.frame.mdm.mdmModuleDbFileds.dao.IMdmModuleDbFiledsDao;
 import com.hzya.frame.mdm.mdmModuleDbFileds.service.IMdmModuleDbFiledsService;
 import org.springframework.stereotype.Service; 
 import org.springframework.beans.factory.annotation.Autowired;
-
 import javax.annotation.Resource;
-
 import com.hzya.frame.basedao.service.impl.BaseService;
-
 /**
  * 模版数据库字段表(MdmModuleDbFileds)表服务实现类
  *
  * @author makejava
- * @since 2023-10-17 15:28:09
+ * @since 2024-06-03 08:47:01
  */
 @Service(value = "mdmModuleDbFiledsService")
 public class MdmModuleDbFiledsServiceImpl extends BaseService<MdmModuleDbFiledsEntity, String> implements IMdmModuleDbFiledsService {

service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/dao/IMdmModuleDbFiledsRuleDao.java

@@ -7,7 +7,7 @@ import com.hzya.frame.basedao.dao.IBaseDao;
  * 模版数据库字段规则表(mdm_module_db_fileds_rule: table)表数据库访问层
  *
  * @author makejava
- * @since 2023-11-04 11:16:44
+ * @since 2024-06-03 08:47:10
  */
 public interface IMdmModuleDbFiledsRuleDao extends IBaseDao<MdmModuleDbFiledsRuleEntity, String> {
 

service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/dao/impl/MdmModuleDbFiledsRuleDaoImpl.java

@@ -8,7 +8,7 @@ import com.hzya.frame.basedao.dao.MybatisGenericDao;
  * 模版数据库字段规则表(MdmModuleDbFiledsRule)表数据库访问层
  *
  * @author makejava
- * @since 2023-11-04 11:16:44
+ * @since 2024-06-03 08:47:10
  */
 @Repository(value = "MdmModuleDbFiledsRuleDaoImpl")
 public class MdmModuleDbFiledsRuleDaoImpl extends MybatisGenericDao<MdmModuleDbFiledsRuleEntity, String> implements IMdmModuleDbFiledsRuleDao{

service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/entity/MdmModuleDbFiledsRuleEntity.java

@@ -6,7 +6,7 @@ import com.hzya.frame.web.entity.BaseEntity;
  * 模版数据库字段规则表(MdmModuleDbFiledsRule)实体类
  *
  * @author makejava
- * @since 2023-11-04 11:16:44
+ * @since 2024-06-03 08:47:10
  */
 public class MdmModuleDbFiledsRuleEntity extends BaseEntity {
  
@@ -26,7 +26,10 @@ public class MdmModuleDbFiledsRuleEntity extends BaseEntity {
    private String ruleValue;
   /**  规则类型1、表单属性 2、控件属性 */
    private String ruleType;
-
+  /**  公司id */
+   private String companyId;
+    /**  数据类型 1、新增 2、修改 */
+    private String dataType;
 
     public String getMdmId() {
         return mdmId;
@@ -92,5 +95,20 @@ public class MdmModuleDbFiledsRuleEntity extends BaseEntity {
         this.ruleType = ruleType;
     }
 
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getDataType() {
+        return dataType;
+    }
+
+    public void setDataType(String dataType) {
+        this.dataType = dataType;
+    }
 }
 

service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/entity/MdmModuleDbFiledsRuleEntity.xml

@@ -19,6 +19,7 @@
            <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">
@@ -38,6 +39,7 @@
         ,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">
@@ -61,6 +63,7 @@
             <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>
@@ -87,6 +90,7 @@
             <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>
@@ -115,6 +119,7 @@
             <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>
@@ -143,6 +148,7 @@
               <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>
@@ -169,6 +175,7 @@
             <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(
@@ -189,24 +196,25 @@
             <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, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id,  sts) 
+  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.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id}, 'Y')
+    (#{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, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id)
+    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.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id})
+    (#{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),
@@ -217,13 +225,13 @@
     rule_code = values(rule_code),
     rule_value = values(rule_value),
     rule_type = values(rule_type),
-    sorts = values(sorts),
     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)</insert>
+    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
@@ -236,13 +244,13 @@ update mdm_module_db_fileds_rule  set
   <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="sorts != null"> sorts = #{sorts},</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>
@@ -266,6 +274,7 @@ update mdm_module_db_fileds_rule  set sts= 'N' ,modify_time = #{modify_time},mod
             <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>

service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/service/IMdmModuleDbFiledsRuleService.java

@@ -6,7 +6,7 @@ import com.hzya.frame.basedao.service.IBaseService;
  * 模版数据库字段规则表(MdmModuleDbFiledsRule)表服务接口
  *
  * @author makejava
- * @since 2023-11-04 11:16:44
+ * @since 2024-06-03 08:47:10
  */
 public interface IMdmModuleDbFiledsRuleService extends IBaseService<MdmModuleDbFiledsRuleEntity, String>{
 }

service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRule/service/impl/MdmModuleDbFiledsRuleServiceImpl.java

@@ -11,7 +11,7 @@ import com.hzya.frame.basedao.service.impl.BaseService;
  * 模版数据库字段规则表(MdmModuleDbFiledsRule)表服务实现类
  *
  * @author makejava
- * @since 2023-11-04 11:16:44
+ * @since 2024-06-03 08:47:10
  */
 @Service(value = "mdmModuleDbFiledsRuleService")
 public class MdmModuleDbFiledsRuleServiceImpl extends BaseService<MdmModuleDbFiledsRuleEntity, String> implements IMdmModuleDbFiledsRuleService {

service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRuleFiles/dao/IMdmModuleDbFiledsRuleFilesDao.java

@@ -1,15 +0,0 @@
-package com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.dao;
-
-import com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.entity.MdmModuleDbFiledsRuleFilesEntity;
-import com.hzya.frame.basedao.dao.IBaseDao;
-
-/**
- * 模版数据库字段规则档案表(mdm_module_db_fileds_rule_files: table)表数据库访问层
- *
- * @author makejava
- * @since 2023-10-17 15:30:12
- */
-public interface IMdmModuleDbFiledsRuleFilesDao extends IBaseDao<MdmModuleDbFiledsRuleFilesEntity, String> {
-
-}
-

service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRuleFiles/dao/impl/MdmModuleDbFiledsRuleFilesDaoImpl.java

@@ -1,18 +0,0 @@
-package com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.dao.impl;
-
-import com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.entity.MdmModuleDbFiledsRuleFilesEntity;
-import com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.dao.IMdmModuleDbFiledsRuleFilesDao;
-import org.springframework.stereotype.Repository;
-import com.hzya.frame.basedao.dao.MybatisGenericDao;
-
-/**
- * 模版数据库字段规则档案表(MdmModuleDbFiledsRuleFiles)表数据库访问层
- *
- * @author makejava
- * @since 2023-10-17 15:30:12
- */
-@Repository(value = "MdmModuleDbFiledsRuleFilesDaoImpl")
-public class MdmModuleDbFiledsRuleFilesDaoImpl extends MybatisGenericDao<MdmModuleDbFiledsRuleFilesEntity, String> implements IMdmModuleDbFiledsRuleFilesDao {
-
-}
-

service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRuleFiles/entity/MdmModuleDbFiledsRuleFilesEntity.java

@@ -1,66 +0,0 @@
-package com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.entity;
-
-import java.util.Date;
-
-import com.hzya.frame.web.entity.BaseEntity;
-
-/**
- * 模版数据库字段规则档案表(MdmModuleDbFiledsRuleFiles)实体类
- *
- * @author makejava
- * @since 2023-10-17 15:30:13
- */
-public class MdmModuleDbFiledsRuleFilesEntity extends BaseEntity {
-
-    /**
-     * 规则名称
-     */
-    private String ruleName;
-    /**
-     * 规则编码
-     */
-    private String ruleCode;
-    /**
-     * 规则类型 1、表单属性 2、控件属性
-     */
-    private String ruleType;
-    /**
-     * 规则值
-     */
-    private String ruleValue;
-
-
-    public String getRuleName() {
-        return ruleName;
-    }
-
-    public void setRuleName(String ruleName) {
-        this.ruleName = ruleName;
-    }
-
-    public String getRuleCode() {
-        return ruleCode;
-    }
-
-    public void setRuleCode(String ruleCode) {
-        this.ruleCode = ruleCode;
-    }
-
-    public String getRuleType() {
-        return ruleType;
-    }
-
-    public void setRuleType(String ruleType) {
-        this.ruleType = ruleType;
-    }
-
-    public String getRuleValue() {
-        return ruleValue;
-    }
-
-    public void setRuleValue(String ruleValue) {
-        this.ruleValue = ruleValue;
-    }
-
-}
-

service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRuleFiles/entity/MdmModuleDbFiledsRuleFilesEntity.xml

@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.dao.impl.MdmModuleDbFiledsRuleFilesDaoImpl">
-
-    <resultMap id="get-MdmModuleDbFiledsRuleFilesEntity-result"
-               type="com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.entity.MdmModuleDbFiledsRuleFilesEntity">
-        <result property="id" column="id" jdbcType="VARCHAR"/>
-        <result property="ruleName" column="rule_name" jdbcType="VARCHAR"/>
-        <result property="ruleCode" column="rule_code" jdbcType="VARCHAR"/>
-        <result property="ruleType" column="rule_type" jdbcType="VARCHAR"/>
-        <result property="ruleValue" column="rule_value" 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"/>
-    </resultMap>
-    <!-- 查询的字段-->
-    <sql id="MdmModuleDbFiledsRuleFilesEntity_Base_Column_List">
-        id
-       ,rule_name 
-        ,rule_code 
-        ,rule_type 
-        ,rule_value 
-        ,sorts 
-        ,create_user_id 
-        ,create_time 
-        ,modify_user_id 
-        ,modify_time 
-        ,sts 
-        ,org_id 
-     </sql>
-    <!-- 查询 采用==查询 -->
-    <select id="entity_list_base" resultMap="get-MdmModuleDbFiledsRuleFilesEntity-result"
-            parameterType="com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.entity.MdmModuleDbFiledsRuleFilesEntity">
-        select
-        <include refid="MdmModuleDbFiledsRuleFilesEntity_Base_Column_List"/>
-        from mdm_module_db_fileds_rule_files
-        <trim prefix="where" prefixOverrides="and">
-            <if test="id != null and id != ''">and id = #{id}</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="ruleType != null and ruleType != ''">and rule_type = #{ruleType}</if>
-            <if test="ruleValue != null and ruleValue != ''">and rule_value = #{ruleValue}</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>
-            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.mdmModuleDbFiledsRuleFiles.entity.MdmModuleDbFiledsRuleFilesEntity">
-        select count(1) from mdm_module_db_fileds_rule_files
-        <trim prefix="where" prefixOverrides="and">
-            <if test="id != null and id != ''">and id = #{id}</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="ruleType != null and ruleType != ''">and rule_type = #{ruleType}</if>
-            <if test="ruleValue != null and ruleValue != ''">and rule_value = #{ruleValue}</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>
-            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>
-
-    <!-- 分页查询列表 采用like格式 -->
-    <select id="entity_list_like" resultMap="get-MdmModuleDbFiledsRuleFilesEntity-result"
-            parameterType="com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.entity.MdmModuleDbFiledsRuleFilesEntity">
-        select
-        <include refid="MdmModuleDbFiledsRuleFilesEntity_Base_Column_List"/>
-        from mdm_module_db_fileds_rule_files
-        <trim prefix="where" prefixOverrides="and">
-            <if test="id != null and id != ''">and id like concat('%',#{id},'%')</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="ruleType != null and ruleType != ''">and rule_type like concat('%',#{ruleType},'%')</if>
-            <if test="ruleValue != null and ruleValue != ''">and rule_value like concat('%',#{ruleValue},'%')</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>
-            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>
-
-    <!-- 查询列表 字段采用or格式 -->
-    <select id="MdmModuleDbFiledsRuleFilesentity_list_or" resultMap="get-MdmModuleDbFiledsRuleFilesEntity-result"
-            parameterType="com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.entity.MdmModuleDbFiledsRuleFilesEntity">
-        select
-        <include refid="MdmModuleDbFiledsRuleFilesEntity_Base_Column_List"/>
-        from mdm_module_db_fileds_rule_files
-        <trim prefix="where" prefixOverrides="and">
-            <if test="id != null and id != ''">or id = #{id}</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="ruleType != null and ruleType != ''">or rule_type = #{ruleType}</if>
-            <if test="ruleValue != null and ruleValue != ''">or rule_value = #{ruleValue}</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>
-            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>
-
-    <!--新增所有列-->
-    <insert id="entity_insert"
-            parameterType="com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.entity.MdmModuleDbFiledsRuleFilesEntity"
-            >
-        insert into mdm_module_db_fileds_rule_files(
-        <trim suffix="" suffixOverrides=",">
-            <if test="id != null and id != ''">id ,</if>
-            <if test="ruleName != null and ruleName != ''">rule_name ,</if>
-            <if test="ruleCode != null and ruleCode != ''">rule_code ,</if>
-            <if test="ruleType != null and ruleType != ''">rule_type ,</if>
-            <if test="ruleValue != null and ruleValue != ''">rule_value ,</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="sts == null ">sts,</if>
-        </trim>
-        )values(
-        <trim suffix="" suffixOverrides=",">
-            <if test="id != null and id != ''">#{id} ,</if>
-            <if test="ruleName != null and ruleName != ''">#{ruleName} ,</if>
-            <if test="ruleCode != null and ruleCode != ''">#{ruleCode} ,</if>
-            <if test="ruleType != null and ruleType != ''">#{ruleType} ,</if>
-            <if test="ruleValue != null and ruleValue != ''">#{ruleValue} ,</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="sts == null ">'Y',</if>
-        </trim>
-        )
-    </insert>
-    <!-- 批量新增 -->
-    <insert id="entityInsertBatch" >
-        insert into mdm_module_db_fileds_rule_files(rule_name, rule_code, rule_type, rule_value, sorts, create_user_id,
-        create_time, modify_user_id, modify_time, sts, org_id, sts)
-        values
-        <foreach collection="entities" item="entity" separator=",">
-            (#{entity.ruleName},#{entity.ruleCode},#{entity.ruleType},#{entity.ruleValue},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},
-            'Y')
-        </foreach>
-    </insert>
-    <!-- 批量新增或者修改-->
-    <insert id="entityInsertOrUpdateBatch" >
-        insert into mdm_module_db_fileds_rule_files(rule_name, rule_code, rule_type, rule_value, sorts, create_user_id,
-        create_time, modify_user_id, modify_time, sts, org_id)
-        values
-        <foreach collection="entities" item="entity" separator=",">
-            (#{entity.ruleName},#{entity.ruleCode},#{entity.ruleType},#{entity.ruleValue},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id})
-        </foreach>
-        on duplicate key update
-        rule_name = values(rule_name),
-        rule_code = values(rule_code),
-        rule_type = values(rule_type),
-        rule_value = values(rule_value),
-        sorts = values(sorts),
-        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)
-    </insert>
-    <!--通过主键修改方法-->
-    <update id="entity_update"
-            parameterType="com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.entity.MdmModuleDbFiledsRuleFilesEntity">
-        update mdm_module_db_fileds_rule_files set
-        <trim suffix="" suffixOverrides=",">
-            <if test="ruleName != null and ruleName != ''">rule_name = #{ruleName},</if>
-            <if test="ruleCode != null and ruleCode != ''">rule_code = #{ruleCode},</if>
-            <if test="ruleType != null and ruleType != ''">rule_type = #{ruleType},</if>
-            <if test="ruleValue != null and ruleValue != ''">rule_value = #{ruleValue},</if>
-            <if test="sorts != null">sorts = #{sorts},</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>
-        </trim>
-        where id = #{id}
-    </update>
-    <!-- 逻辑删除 -->
-    <update id="entity_logicDelete"
-            parameterType="com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.entity.MdmModuleDbFiledsRuleFilesEntity">
-update mdm_module_db_fileds_rule_files  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.mdmModuleDbFiledsRuleFiles.entity.MdmModuleDbFiledsRuleFilesEntity">
-        update mdm_module_db_fileds_rule_files 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="ruleName != null and ruleName != ''">and rule_name = #{ruleName}</if>
-            <if test="ruleCode != null and ruleCode != ''">and rule_code = #{ruleCode}</if>
-            <if test="ruleType != null and ruleType != ''">and rule_type = #{ruleType}</if>
-            <if test="ruleValue != null and ruleValue != ''">and rule_value = #{ruleValue}</if>
-            <if test="sorts != null">and sorts = #{sorts}</if>
-            <if test="sts != null and sts != ''">and sts = #{sts}</if>
-            and sts='Y'
-        </trim>
-    </update>
-    <!--通过主键删除-->
-    <delete id="entity_delete">
-    delete from mdm_module_db_fileds_rule_files where id = #{id}
-</delete>
-
-</mapper>
-

service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRuleFiles/service/IMdmModuleDbFiledsRuleFilesService.java

@@ -1,13 +0,0 @@
-package com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.service;
-
-import com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.entity.MdmModuleDbFiledsRuleFilesEntity;
-import com.hzya.frame.basedao.service.IBaseService;
-
-/**
- * 模版数据库字段规则档案表(MdmModuleDbFiledsRuleFiles)表服务接口
- *
- * @author makejava
- * @since 2023-10-17 15:30:14
- */
-public interface IMdmModuleDbFiledsRuleFilesService extends IBaseService<MdmModuleDbFiledsRuleFilesEntity, String> {
-}

service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFiledsRuleFiles/service/impl/MdmModuleDbFiledsRuleFilesServiceImpl.java

@@ -1,29 +0,0 @@
-package com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.service.impl;
-
-import com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.entity.MdmModuleDbFiledsRuleFilesEntity;
-import com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.dao.IMdmModuleDbFiledsRuleFilesDao;
-import com.hzya.frame.mdm.mdmModuleDbFiledsRuleFiles.service.IMdmModuleDbFiledsRuleFilesService;
-import org.springframework.stereotype.Service;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import javax.annotation.Resource;
-
-import com.hzya.frame.basedao.service.impl.BaseService;
-
-/**
- * 模版数据库字段规则档案表(MdmModuleDbFiledsRuleFiles)表服务实现类
- *
- * @author makejava
- * @since 2023-10-17 15:30:15
- */
-@Service(value = "mdmModuleDbFiledsRuleFilesService")
-public class MdmModuleDbFiledsRuleFilesServiceImpl extends BaseService<MdmModuleDbFiledsRuleFilesEntity, String> implements IMdmModuleDbFiledsRuleFilesService {
-
-    private IMdmModuleDbFiledsRuleFilesDao mdmModuleDbFiledsRuleFilesDao;
-
-    @Autowired
-    public void setMdmModuleDbFiledsRuleFilesDao(IMdmModuleDbFiledsRuleFilesDao dao) {
-        this.mdmModuleDbFiledsRuleFilesDao = dao;
-        this.dao = dao;
-    }
-}

service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/IMdmModuleDistributeDao.java

@@ -7,7 +7,7 @@ import com.hzya.frame.basedao.dao.IBaseDao;
  * 主数据功能应用分发表(mdm_module_distribute: table)表数据库访问层
  *
  * @author makejava
- * @since 2023-11-06 15:27:41
+ * @since 2024-06-03 08:47:33
  */
 public interface IMdmModuleDistributeDao extends IBaseDao<MdmModuleDistributeEntity, String> {
 

service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/dao/impl/MdmModuleDistributeDaoImpl.java

@@ -8,7 +8,7 @@ import com.hzya.frame.basedao.dao.MybatisGenericDao;
  * 主数据功能应用分发表(MdmModuleDistribute)表数据库访问层
  *
  * @author makejava
- * @since 2023-11-06 15:27:42
+ * @since 2024-06-03 08:47:33
  */
 @Repository(value = "MdmModuleDistributeDaoImpl")
 public class MdmModuleDistributeDaoImpl extends MybatisGenericDao<MdmModuleDistributeEntity, String> implements IMdmModuleDistributeDao{

service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.java

@@ -9,7 +9,7 @@ import com.hzya.frame.web.entity.BaseEntity;
  * 主数据功能应用分发表(MdmModuleDistribute)实体类
  *
  * @author makejava
- * @since 2023-11-06 15:27:42
+ * @since 2024-06-03 08:47:33
  */
 public class MdmModuleDistributeEntity extends BaseEntity {
  
@@ -17,36 +17,17 @@ public class MdmModuleDistributeEntity extends BaseEntity {
    private String mdmId;
   /**  应用id */
    private String appId;
+  /**  修改接口 */
+   private String updateApi;
   /**  新增接口 */
    private String addApi;
   /**  删除接口 */
    private String deleteApi;
-  /**  新增使用类型 */
-   private String addType;
-  /**  删除使用类型 */
-   private String deleteType;
-  /**  新增插件 */
-   private String addPlug;
-  /**  删除插件 */
-   private String deletePlug;
-    private List<MdmModuleDistributeDetailEntity> addList;
-    private List<MdmModuleDistributeDetailEntity> deleteList;
-
-    public List<MdmModuleDistributeDetailEntity> getAddList() {
-        return addList;
-    }
-
-    public void setAddList(List<MdmModuleDistributeDetailEntity> addList) {
-        this.addList = addList;
-    }
-
-    public List<MdmModuleDistributeDetailEntity> getDeleteList() {
-        return deleteList;
-    }
-
-    public void setDeleteList(List<MdmModuleDistributeDetailEntity> deleteList) {
-        this.deleteList = deleteList;
-    }
+  /**  启用停用 0、停用1、启用 */
+   private String enabledState;
+  /**  公司id */
+   private String companyId;
+    private List<MdmModuleDistributeDetailEntity> mdmModuleDistributeDetailEntities;
 
     public String getMdmId() {
         return mdmId;
@@ -64,6 +45,14 @@ public class MdmModuleDistributeEntity extends BaseEntity {
         this.appId = appId;
     }
 
+    public String getUpdateApi() {
+        return updateApi;
+    }
+
+    public void setUpdateApi(String updateApi) {
+        this.updateApi = updateApi;
+    }
+
     public String getAddApi() {
         return addApi;
     }
@@ -80,37 +69,28 @@ public class MdmModuleDistributeEntity extends BaseEntity {
         this.deleteApi = deleteApi;
     }
 
-    public String getAddType() {
-        return addType;
+    public String getEnabledState() {
+        return enabledState;
     }
 
-    public void setAddType(String addType) {
-        this.addType = addType;
+    public void setEnabledState(String enabledState) {
+        this.enabledState = enabledState;
     }
 
-    public String getDeleteType() {
-        return deleteType;
+    public String getCompanyId() {
+        return companyId;
     }
 
-    public void setDeleteType(String deleteType) {
-        this.deleteType = deleteType;
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
     }
 
-    public String getAddPlug() {
-        return addPlug;
-    }
-
-    public void setAddPlug(String addPlug) {
-        this.addPlug = addPlug;
-    }
-
-    public String getDeletePlug() {
-        return deletePlug;
-    }
-
-    public void setDeletePlug(String deletePlug) {
-        this.deletePlug = deletePlug;
+    public List<MdmModuleDistributeDetailEntity> getMdmModuleDistributeDetailEntities() {
+        return mdmModuleDistributeDetailEntities;
     }
 
+    public void setMdmModuleDistributeDetailEntities(List<MdmModuleDistributeDetailEntity> mdmModuleDistributeDetailEntities) {
+        this.mdmModuleDistributeDetailEntities = mdmModuleDistributeDetailEntities;
+    }
 }
 

service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.xml

@@ -6,10 +6,10 @@
        <result property="id" column="id" jdbcType="VARCHAR"/>
            <result property="mdmId" column="mdm_id" jdbcType="VARCHAR"/>
            <result property="appId" column="app_id" jdbcType="VARCHAR"/>
+           <result property="updateApi" column="update_api" jdbcType="VARCHAR"/>
            <result property="addApi" column="add_api" jdbcType="VARCHAR"/>
            <result property="deleteApi" column="delete_api" jdbcType="VARCHAR"/>
-           <result property="addType" column="add_type" jdbcType="VARCHAR"/>
-           <result property="deleteType" column="delete_type" jdbcType="VARCHAR"/>
+           <result property="enabledState" column="enabled_state" 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"/>
@@ -17,18 +17,17 @@
            <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="addPlug" column="add_plug" jdbcType="VARCHAR"/>
-           <result property="deletePlug" column="delete_plug" jdbcType="VARCHAR"/>
+           <result property="companyId" column="company_id" jdbcType="VARCHAR"/>
         </resultMap>
     <!-- 查询的字段-->
     <sql id = "MdmModuleDistributeEntity_Base_Column_List">
         id
        ,mdm_id 
         ,app_id 
+        ,update_api 
         ,add_api 
         ,delete_api 
-        ,add_type 
-        ,delete_type 
+        ,enabled_state 
         ,sorts 
         ,create_user_id 
         ,create_time 
@@ -36,8 +35,7 @@
         ,modify_time 
         ,sts 
         ,org_id 
-        ,add_plug 
-        ,delete_plug 
+        ,company_id 
      </sql>
  <!-- 查询 采用==查询 -->
  <select id="entity_list_base" resultMap="get-MdmModuleDistributeEntity-result" parameterType = "com.hzya.frame.mdm.mdmModuleDistribute.entity.MdmModuleDistributeEntity">
@@ -48,10 +46,10 @@
         <if test="id != null and id != ''"> and id = #{id} </if>
             <if test="mdmId != null and mdmId != ''"> and mdm_id = #{mdmId} </if>
             <if test="appId != null and appId != ''"> and app_id = #{appId} </if>
+            <if test="updateApi != null and updateApi != ''"> and update_api = #{updateApi} </if>
             <if test="addApi != null and addApi != ''"> and add_api = #{addApi} </if>
             <if test="deleteApi != null and deleteApi != ''"> and delete_api = #{deleteApi} </if>
-            <if test="addType != null and addType != ''"> and add_type = #{addType} </if>
-            <if test="deleteType != null and deleteType != ''"> and delete_type = #{deleteType} </if>
+            <if test="enabledState != null and enabledState != ''"> and enabled_state = #{enabledState} </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>
@@ -59,8 +57,7 @@
             <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="addPlug != null and addPlug != ''"> and add_plug = #{addPlug} </if>
-            <if test="deletePlug != null and deletePlug != ''"> and delete_plug = #{deletePlug} </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>
@@ -74,10 +71,10 @@
         <if test="id != null and id != ''"> and id = #{id} </if>
             <if test="mdmId != null and mdmId != ''"> and mdm_id = #{mdmId} </if>
             <if test="appId != null and appId != ''"> and app_id = #{appId} </if>
+            <if test="updateApi != null and updateApi != ''"> and update_api = #{updateApi} </if>
             <if test="addApi != null and addApi != ''"> and add_api = #{addApi} </if>
             <if test="deleteApi != null and deleteApi != ''"> and delete_api = #{deleteApi} </if>
-            <if test="addType != null and addType != ''"> and add_type = #{addType} </if>
-            <if test="deleteType != null and deleteType != ''"> and delete_type = #{deleteType} </if>
+            <if test="enabledState != null and enabledState != ''"> and enabled_state = #{enabledState} </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>
@@ -85,8 +82,7 @@
             <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="addPlug != null and addPlug != ''"> and add_plug = #{addPlug} </if>
-            <if test="deletePlug != null and deletePlug != ''"> and delete_plug = #{deletePlug} </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>
@@ -102,10 +98,10 @@
         <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="appId != null and appId != ''"> and app_id like concat('%',#{appId},'%') </if>
+            <if test="updateApi != null and updateApi != ''"> and update_api like concat('%',#{updateApi},'%') </if>
             <if test="addApi != null and addApi != ''"> and add_api like concat('%',#{addApi},'%') </if>
             <if test="deleteApi != null and deleteApi != ''"> and delete_api like concat('%',#{deleteApi},'%') </if>
-            <if test="addType != null and addType != ''"> and add_type like concat('%',#{addType},'%') </if>
-            <if test="deleteType != null and deleteType != ''"> and delete_type like concat('%',#{deleteType},'%') </if>
+            <if test="enabledState != null and enabledState != ''"> and enabled_state like concat('%',#{enabledState},'%') </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>
@@ -113,8 +109,7 @@
             <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="addPlug != null and addPlug != ''"> and add_plug like concat('%',#{addPlug},'%') </if>
-            <if test="deletePlug != null and deletePlug != ''"> and delete_plug like concat('%',#{deletePlug},'%') </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>
@@ -130,10 +125,10 @@
          <if test="id != null and id != ''"> or id = #{id} </if>
              <if test="mdmId != null and mdmId != ''"> or mdm_id = #{mdmId} </if>
              <if test="appId != null and appId != ''"> or app_id = #{appId} </if>
+             <if test="updateApi != null and updateApi != ''"> or update_api = #{updateApi} </if>
              <if test="addApi != null and addApi != ''"> or add_api = #{addApi} </if>
              <if test="deleteApi != null and deleteApi != ''"> or delete_api = #{deleteApi} </if>
-             <if test="addType != null and addType != ''"> or add_type = #{addType} </if>
-             <if test="deleteType != null and deleteType != ''"> or delete_type = #{deleteType} </if>
+             <if test="enabledState != null and enabledState != ''"> or enabled_state = #{enabledState} </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>
@@ -141,8 +136,7 @@
               <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="addPlug != null and addPlug != ''"> or add_plug = #{addPlug} </if>
-             <if test="deletePlug != null and deletePlug != ''"> or delete_plug = #{deletePlug} </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>
@@ -156,10 +150,10 @@
        <if test="id != null and id != ''"> id , </if>
             <if test="mdmId != null and mdmId != ''"> mdm_id , </if>
             <if test="appId != null and appId != ''"> app_id , </if>
+            <if test="updateApi != null and updateApi != ''"> update_api , </if>
             <if test="addApi != null and addApi != ''"> add_api , </if>
             <if test="deleteApi != null and deleteApi != ''"> delete_api , </if>
-            <if test="addType != null and addType != ''"> add_type , </if>
-            <if test="deleteType != null and deleteType != ''"> delete_type , </if>
+            <if test="enabledState != null and enabledState != ''"> enabled_state , </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>
@@ -167,8 +161,7 @@
             <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="addPlug != null and addPlug != ''"> add_plug , </if>
-            <if test="deletePlug != null and deletePlug != ''"> delete_plug , </if>
+            <if test="companyId != null and companyId != ''"> company_id , </if>
     <if test="sts == null ">sts,</if>
   </trim>
   )values(
@@ -176,10 +169,10 @@
        <if test="id != null and id != ''"> #{id} ,</if>
             <if test="mdmId != null and mdmId != ''"> #{mdmId} ,</if>
             <if test="appId != null and appId != ''"> #{appId} ,</if>
+            <if test="updateApi != null and updateApi != ''"> #{updateApi} ,</if>
             <if test="addApi != null and addApi != ''"> #{addApi} ,</if>
             <if test="deleteApi != null and deleteApi != ''"> #{deleteApi} ,</if>
-            <if test="addType != null and addType != ''"> #{addType} ,</if>
-            <if test="deleteType != null and deleteType != ''"> #{deleteType} ,</if>
+            <if test="enabledState != null and enabledState != ''"> #{enabledState} ,</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>
@@ -187,62 +180,57 @@
             <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="addPlug != null and addPlug != ''"> #{addPlug} ,</if>
-            <if test="deletePlug != null and deletePlug != ''"> #{deletePlug} ,</if>
+            <if test="companyId != null and companyId != ''"> #{companyId} ,</if>
     <if test="sts == null ">'Y',</if>
   </trim>
   )  
 </insert>
 <!-- 批量新增 -->
 <insert id="entityInsertBatch"  >
-  insert into mdm_module_distribute(mdm_id, app_id, add_api, delete_api, add_type, delete_type, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, add_plug, delete_plug,  sts) 
+  insert into mdm_module_distribute(mdm_id, app_id, update_api, add_api, delete_api, enabled_state, 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.appId},#{entity.addApi},#{entity.deleteApi},#{entity.addType},#{entity.deleteType},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.addPlug},#{entity.deletePlug}, 'Y')
+    (#{entity.mdmId},#{entity.appId},#{entity.updateApi},#{entity.addApi},#{entity.deleteApi},#{entity.enabledState},#{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_distribute(mdm_id, app_id, add_api, delete_api, add_type, delete_type, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, add_plug, delete_plug)
+    insert into mdm_module_distribute(mdm_id, app_id, update_api, add_api, delete_api, enabled_state, 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.appId},#{entity.addApi},#{entity.deleteApi},#{entity.addType},#{entity.deleteType},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.addPlug},#{entity.deletePlug})
+    (#{entity.mdmId},#{entity.appId},#{entity.updateApi},#{entity.addApi},#{entity.deleteApi},#{entity.enabledState},#{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),
     app_id = values(app_id),
+    update_api = values(update_api),
     add_api = values(add_api),
     delete_api = values(delete_api),
-    add_type = values(add_type),
-    delete_type = values(delete_type),
-    sorts = values(sorts),
+    enabled_state = values(enabled_state),
     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),
-    add_plug = values(add_plug),
-    delete_plug = values(delete_plug)</insert>
+    company_id = values(company_id)</insert>
 <!--通过主键修改方法-->
 <update id="entity_update" parameterType = "com.hzya.frame.mdm.mdmModuleDistribute.entity.MdmModuleDistributeEntity" >
 update mdm_module_distribute  set
 <trim suffix="" suffixOverrides=",">
   <if test="mdmId != null and mdmId != ''"> mdm_id = #{mdmId},</if>
   <if test="appId != null and appId != ''"> app_id = #{appId},</if>
+  <if test="updateApi != null and updateApi != ''"> update_api = #{updateApi},</if>
   <if test="addApi != null and addApi != ''"> add_api = #{addApi},</if>
   <if test="deleteApi != null and deleteApi != ''"> delete_api = #{deleteApi},</if>
-  <if test="addType != null and addType != ''"> add_type = #{addType},</if>
-  <if test="deleteType != null and deleteType != ''"> delete_type = #{deleteType},</if>
-  <if test="sorts != null"> sorts = #{sorts},</if>
+  <if test="enabledState != null and enabledState != ''"> enabled_state = #{enabledState},</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="addPlug != null and addPlug != ''"> add_plug = #{addPlug},</if>
-  <if test="deletePlug != null and deletePlug != ''"> delete_plug = #{deletePlug},</if>
+    <if test="companyId != null and companyId != ''"> company_id = #{companyId},</if>
 </trim>
 where id = #{id}
 </update>
@@ -258,14 +246,13 @@ update mdm_module_distribute  set sts= 'N' ,modify_time = #{modify_time},modify_
         <if test="id != null and id != ''"> and id = #{id} </if>
             <if test="mdmId != null and mdmId != ''"> and mdm_id = #{mdmId} </if>
             <if test="appId != null and appId != ''"> and app_id = #{appId} </if>
+            <if test="updateApi != null and updateApi != ''"> and update_api = #{updateApi} </if>
             <if test="addApi != null and addApi != ''"> and add_api = #{addApi} </if>
             <if test="deleteApi != null and deleteApi != ''"> and delete_api = #{deleteApi} </if>
-            <if test="addType != null and addType != ''"> and add_type = #{addType} </if>
-            <if test="deleteType != null and deleteType != ''"> and delete_type = #{deleteType} </if>
+            <if test="enabledState != null and enabledState != ''"> and enabled_state = #{enabledState} </if>
             <if test="sorts != null"> and sorts = #{sorts} </if>
                                                                 <if test="sts != null and sts != ''"> and sts = #{sts} </if>
-                         <if test="addPlug != null and addPlug != ''"> and add_plug = #{addPlug} </if>
-            <if test="deletePlug != null and deletePlug != ''"> and delete_plug = #{deletePlug} </if>
+                         <if test="companyId != null and companyId != ''"> and company_id = #{companyId} </if>
             and sts='Y'
     </trim>
 </update>

service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/service/IMdmModuleDistributeService.java

@@ -6,7 +6,7 @@ import com.hzya.frame.basedao.service.IBaseService;
  * 主数据功能应用分发表(MdmModuleDistribute)表服务接口
  *
  * @author makejava
- * @since 2023-11-06 15:27:42
+ * @since 2024-06-03 08:47:33
  */
 public interface IMdmModuleDistributeService extends IBaseService<MdmModuleDistributeEntity, String>{
 }

service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/service/impl/MdmModuleDistributeServiceImpl.java

@@ -11,7 +11,7 @@ import com.hzya.frame.basedao.service.impl.BaseService;
  * 主数据功能应用分发表(MdmModuleDistribute)表服务实现类
  *
  * @author makejava
- * @since 2023-11-06 15:27:42
+ * @since 2024-06-03 08:47:33
  */
 @Service(value = "mdmModuleDistributeService")
 public class MdmModuleDistributeServiceImpl extends BaseService<MdmModuleDistributeEntity, String> implements IMdmModuleDistributeService {

service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/dao/IMdmModuleDistributeDetailDao.java

@@ -7,7 +7,7 @@ import com.hzya.frame.basedao.dao.IBaseDao;
  * 主数据功能应用分发明细表(mdm_module_distribute_detail: table)表数据库访问层
  *
  * @author makejava
- * @since 2023-11-07 09:11:31
+ * @since 2024-06-03 08:48:18
  */
 public interface IMdmModuleDistributeDetailDao extends IBaseDao<MdmModuleDistributeDetailEntity, String> {
 

service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/dao/impl/MdmModuleDistributeDetailDaoImpl.java

@@ -8,7 +8,7 @@ import com.hzya.frame.basedao.dao.MybatisGenericDao;
  * 主数据功能应用分发明细表(MdmModuleDistributeDetail)表数据库访问层
  *
  * @author makejava
- * @since 2023-11-07 09:11:31
+ * @since 2024-06-03 08:48:18
  */
 @Repository(value = "MdmModuleDistributeDetailDaoImpl")
 public class MdmModuleDistributeDetailDaoImpl extends MybatisGenericDao<MdmModuleDistributeDetailEntity, String> implements IMdmModuleDistributeDetailDao{

service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/entity/MdmModuleDistributeDetailEntity.java

@@ -6,7 +6,7 @@ import com.hzya.frame.web.entity.BaseEntity;
  * 主数据功能应用分发明细表(MdmModuleDistributeDetail)实体类
  *
  * @author makejava
- * @since 2023-11-07 09:11:31
+ * @since 2024-06-03 08:48:18
  */
 public class MdmModuleDistributeDetailEntity extends BaseEntity {
  
@@ -16,24 +16,16 @@ public class MdmModuleDistributeDetailEntity extends BaseEntity {
    private String distributeId;
   /**  接口id */
    private String apiId;
-  /**  源API字段 */
-   private String sourceField;
-  /**  源API字段名 */
-   private String sourceName;
-  /**  目标API字段 */
-   private String targetField;
-  /**  目标API字段名 */
-   private String targetName;
+  /**  数据类型 1、新增2、修改3、删除 */
+   private String dataType;
+  /**  字段名 */
+   private String filedName;
+  /**  对比类型 1、等于  */
+   private String compareType;
   /**  目标API字段默认值 */
-   private String defaultVaule;
-  /**  源字段层级 */
-   private String sourceFieldPath;
-  /**  目标字段层级 */
-   private String targetFieldPath;
- private String targetPath;
- private String sourcePath;
-  /**  连线信息 */
-   private String coordinate;
+   private String filedVaule;
+  /**  公司id */
+   private String companyId;
 
 
     public String getMdmId() {
@@ -60,84 +52,44 @@ public class MdmModuleDistributeDetailEntity extends BaseEntity {
         this.apiId = apiId;
     }
 
-    public String getSourceField() {
-        return sourceField;
+    public String getDataType() {
+        return dataType;
     }
 
-    public void setSourceField(String sourceField) {
-        this.sourceField = sourceField;
+    public void setDataType(String dataType) {
+        this.dataType = dataType;
     }
 
-    public String getSourceName() {
-        return sourceName;
+    public String getFiledName() {
+        return filedName;
     }
 
-    public void setSourceName(String sourceName) {
-        this.sourceName = sourceName;
+    public void setFiledName(String filedName) {
+        this.filedName = filedName;
     }
 
-    public String getTargetField() {
-        return targetField;
+    public String getCompareType() {
+        return compareType;
     }
 
-    public void setTargetField(String targetField) {
-        this.targetField = targetField;
+    public void setCompareType(String compareType) {
+        this.compareType = compareType;
     }
 
-    public String getTargetName() {
-        return targetName;
+    public String getFiledVaule() {
+        return filedVaule;
     }
 
-    public void setTargetName(String targetName) {
-        this.targetName = targetName;
+    public void setFiledVaule(String filedVaule) {
+        this.filedVaule = filedVaule;
     }
 
-    public String getDefaultVaule() {
-        return defaultVaule;
+    public String getCompanyId() {
+        return companyId;
     }
 
-    public void setDefaultVaule(String defaultVaule) {
-        this.defaultVaule = defaultVaule;
-    }
-
-    public String getSourceFieldPath() {
-        return sourceFieldPath;
-    }
-
-    public void setSourceFieldPath(String sourceFieldPath) {
-        this.sourceFieldPath = sourceFieldPath;
-    }
-
-    public String getTargetFieldPath() {
-        return targetFieldPath;
-    }
-
-    public void setTargetFieldPath(String targetFieldPath) {
-        this.targetFieldPath = targetFieldPath;
-    }
-
-    public String getTargetPath() {
-        return targetPath;
-    }
-
-    public void setTargetPath(String targetPath) {
-        this.targetPath = targetPath;
-    }
-
-    public String getSourcePath() {
-        return sourcePath;
-    }
-
-    public void setSourcePath(String sourcePath) {
-        this.sourcePath = sourcePath;
-    }
-
-    public String getCoordinate() {
-        return coordinate;
-    }
-
-    public void setCoordinate(String coordinate) {
-        this.coordinate = coordinate;
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
     }
 
 }

service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/entity/MdmModuleDistributeDetailEntity.xml

@@ -7,15 +7,10 @@
            <result property="mdmId" column="mdm_id" jdbcType="VARCHAR"/>
            <result property="distributeId" column="distribute_id" jdbcType="VARCHAR"/>
            <result property="apiId" column="api_id" jdbcType="VARCHAR"/>
-           <result property="sourceField" column="source_field" jdbcType="VARCHAR"/>
-           <result property="sourceName" column="source_name" jdbcType="VARCHAR"/>
-           <result property="targetField" column="target_field" jdbcType="VARCHAR"/>
-           <result property="targetName" column="target_name" jdbcType="VARCHAR"/>
-           <result property="defaultVaule" column="default_vaule" jdbcType="VARCHAR"/>
-           <result property="sourceFieldPath" column="source_field_path" jdbcType="VARCHAR"/>
-           <result property="targetFieldPath" column="target_field_path" jdbcType="VARCHAR"/>
-           <result property="targetPath" column="target_path" jdbcType="VARCHAR"/>
-           <result property="sourcePath" column="source_path" jdbcType="VARCHAR"/>
+           <result property="dataType" column="data_type" jdbcType="VARCHAR"/>
+           <result property="filedName" column="filed_name" jdbcType="VARCHAR"/>
+           <result property="compareType" column="compare_type" jdbcType="VARCHAR"/>
+           <result property="filedVaule" column="filed_vaule" 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"/>
@@ -23,7 +18,7 @@
            <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="coordinate" column="coordinate" jdbcType="VARCHAR"/>
+           <result property="companyId" column="company_id" jdbcType="VARCHAR"/>
         </resultMap>
     <!-- 查询的字段-->
     <sql id = "MdmModuleDistributeDetailEntity_Base_Column_List">
@@ -31,15 +26,10 @@
        ,mdm_id 
         ,distribute_id 
         ,api_id 
-        ,source_field 
-        ,source_name 
-        ,target_field 
-        ,target_name 
-        ,default_vaule 
-        ,source_field_path 
-        ,target_field_path 
-        ,target_path 
-        ,source_path 
+        ,data_type 
+        ,filed_name 
+        ,compare_type 
+        ,filed_vaule 
         ,sorts 
         ,create_user_id 
         ,create_time 
@@ -47,7 +37,7 @@
         ,modify_time 
         ,sts 
         ,org_id 
-        ,coordinate 
+        ,company_id 
      </sql>
  <!-- 查询 采用==查询 -->
  <select id="entity_list_base" resultMap="get-MdmModuleDistributeDetailEntity-result" parameterType = "com.hzya.frame.mdm.mdmModuleDistributeDetail.entity.MdmModuleDistributeDetailEntity">
@@ -59,15 +49,10 @@
             <if test="mdmId != null and mdmId != ''"> and mdm_id = #{mdmId} </if>
             <if test="distributeId != null and distributeId != ''"> and distribute_id = #{distributeId} </if>
             <if test="apiId != null and apiId != ''"> and api_id = #{apiId} </if>
-            <if test="sourceField != null and sourceField != ''"> and source_field = #{sourceField} </if>
-            <if test="sourceName != null and sourceName != ''"> and source_name = #{sourceName} </if>
-            <if test="targetField != null and targetField != ''"> and target_field = #{targetField} </if>
-            <if test="targetName != null and targetName != ''"> and target_name = #{targetName} </if>
-            <if test="defaultVaule != null and defaultVaule != ''"> and default_vaule = #{defaultVaule} </if>
-            <if test="sourceFieldPath != null and sourceFieldPath != ''"> and source_field_path = #{sourceFieldPath} </if>
-            <if test="targetFieldPath != null and targetFieldPath != ''"> and target_field_path = #{targetFieldPath} </if>
-            <if test="targetPath != null and targetPath != ''"> and target_path = #{targetPath} </if>
-            <if test="sourcePath != null and sourcePath != ''"> and source_path = #{sourcePath} </if>
+            <if test="dataType != null and dataType != ''"> and data_type = #{dataType} </if>
+            <if test="filedName != null and filedName != ''"> and filed_name = #{filedName} </if>
+            <if test="compareType != null and compareType != ''"> and compare_type = #{compareType} </if>
+            <if test="filedVaule != null and filedVaule != ''"> and filed_vaule = #{filedVaule} </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>
@@ -75,7 +60,7 @@
             <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="coordinate != null and coordinate != ''"> and coordinate = #{coordinate} </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>
@@ -90,15 +75,10 @@
             <if test="mdmId != null and mdmId != ''"> and mdm_id = #{mdmId} </if>
             <if test="distributeId != null and distributeId != ''"> and distribute_id = #{distributeId} </if>
             <if test="apiId != null and apiId != ''"> and api_id = #{apiId} </if>
-            <if test="sourceField != null and sourceField != ''"> and source_field = #{sourceField} </if>
-            <if test="sourceName != null and sourceName != ''"> and source_name = #{sourceName} </if>
-            <if test="targetField != null and targetField != ''"> and target_field = #{targetField} </if>
-            <if test="targetName != null and targetName != ''"> and target_name = #{targetName} </if>
-            <if test="defaultVaule != null and defaultVaule != ''"> and default_vaule = #{defaultVaule} </if>
-            <if test="sourceFieldPath != null and sourceFieldPath != ''"> and source_field_path = #{sourceFieldPath} </if>
-            <if test="targetFieldPath != null and targetFieldPath != ''"> and target_field_path = #{targetFieldPath} </if>
-            <if test="targetPath != null and targetPath != ''"> and target_path = #{targetPath} </if>
-            <if test="sourcePath != null and sourcePath != ''"> and source_path = #{sourcePath} </if>
+            <if test="dataType != null and dataType != ''"> and data_type = #{dataType} </if>
+            <if test="filedName != null and filedName != ''"> and filed_name = #{filedName} </if>
+            <if test="compareType != null and compareType != ''"> and compare_type = #{compareType} </if>
+            <if test="filedVaule != null and filedVaule != ''"> and filed_vaule = #{filedVaule} </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>
@@ -106,7 +86,7 @@
             <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="coordinate != null and coordinate != ''"> and coordinate = #{coordinate} </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>
@@ -123,15 +103,10 @@
             <if test="mdmId != null and mdmId != ''"> and mdm_id like concat('%',#{mdmId},'%') </if>
             <if test="distributeId != null and distributeId != ''"> and distribute_id like concat('%',#{distributeId},'%') </if>
             <if test="apiId != null and apiId != ''"> and api_id like concat('%',#{apiId},'%') </if>
-            <if test="sourceField != null and sourceField != ''"> and source_field like concat('%',#{sourceField},'%') </if>
-            <if test="sourceName != null and sourceName != ''"> and source_name like concat('%',#{sourceName},'%') </if>
-            <if test="targetField != null and targetField != ''"> and target_field like concat('%',#{targetField},'%') </if>
-            <if test="targetName != null and targetName != ''"> and target_name like concat('%',#{targetName},'%') </if>
-            <if test="defaultVaule != null and defaultVaule != ''"> and default_vaule like concat('%',#{defaultVaule},'%') </if>
-            <if test="sourceFieldPath != null and sourceFieldPath != ''"> and source_field_path like concat('%',#{sourceFieldPath},'%') </if>
-            <if test="targetFieldPath != null and targetFieldPath != ''"> and target_field_path like concat('%',#{targetFieldPath},'%') </if>
-            <if test="targetPath != null and targetPath != ''"> and target_path like concat('%',#{targetPath},'%') </if>
-            <if test="sourcePath != null and sourcePath != ''"> and source_path like concat('%',#{sourcePath},'%') </if>
+            <if test="dataType != null and dataType != ''"> and data_type like concat('%',#{dataType},'%') </if>
+            <if test="filedName != null and filedName != ''"> and filed_name like concat('%',#{filedName},'%') </if>
+            <if test="compareType != null and compareType != ''"> and compare_type like concat('%',#{compareType},'%') </if>
+            <if test="filedVaule != null and filedVaule != ''"> and filed_vaule like concat('%',#{filedVaule},'%') </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>
@@ -139,7 +114,7 @@
             <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="coordinate != null and coordinate != ''"> and coordinate like concat('%',#{coordinate},'%') </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>
@@ -156,15 +131,10 @@
              <if test="mdmId != null and mdmId != ''"> or mdm_id = #{mdmId} </if>
              <if test="distributeId != null and distributeId != ''"> or distribute_id = #{distributeId} </if>
              <if test="apiId != null and apiId != ''"> or api_id = #{apiId} </if>
-             <if test="sourceField != null and sourceField != ''"> or source_field = #{sourceField} </if>
-             <if test="sourceName != null and sourceName != ''"> or source_name = #{sourceName} </if>
-             <if test="targetField != null and targetField != ''"> or target_field = #{targetField} </if>
-             <if test="targetName != null and targetName != ''"> or target_name = #{targetName} </if>
-             <if test="defaultVaule != null and defaultVaule != ''"> or default_vaule = #{defaultVaule} </if>
-             <if test="sourceFieldPath != null and sourceFieldPath != ''"> or source_field_path = #{sourceFieldPath} </if>
-             <if test="targetFieldPath != null and targetFieldPath != ''"> or target_field_path = #{targetFieldPath} </if>
-             <if test="targetPath != null and targetPath != ''"> or target_path = #{targetPath} </if>
-             <if test="sourcePath != null and sourcePath != ''"> or source_path = #{sourcePath} </if>
+             <if test="dataType != null and dataType != ''"> or data_type = #{dataType} </if>
+             <if test="filedName != null and filedName != ''"> or filed_name = #{filedName} </if>
+             <if test="compareType != null and compareType != ''"> or compare_type = #{compareType} </if>
+             <if test="filedVaule != null and filedVaule != ''"> or filed_vaule = #{filedVaule} </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>
@@ -172,7 +142,7 @@
               <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="coordinate != null and coordinate != ''"> or coordinate = #{coordinate} </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>
@@ -187,15 +157,10 @@
             <if test="mdmId != null and mdmId != ''"> mdm_id , </if>
             <if test="distributeId != null and distributeId != ''"> distribute_id , </if>
             <if test="apiId != null and apiId != ''"> api_id , </if>
-            <if test="sourceField != null and sourceField != ''"> source_field , </if>
-            <if test="sourceName != null and sourceName != ''"> source_name , </if>
-            <if test="targetField != null and targetField != ''"> target_field , </if>
-            <if test="targetName != null and targetName != ''"> target_name , </if>
-            <if test="defaultVaule != null and defaultVaule != ''"> default_vaule , </if>
-            <if test="sourceFieldPath != null and sourceFieldPath != ''"> source_field_path , </if>
-            <if test="targetFieldPath != null and targetFieldPath != ''"> target_field_path , </if>
-            <if test="targetPath != null and targetPath != ''"> target_path , </if>
-            <if test="sourcePath != null and sourcePath != ''"> source_path , </if>
+            <if test="dataType != null and dataType != ''"> data_type , </if>
+            <if test="filedName != null and filedName != ''"> filed_name , </if>
+            <if test="compareType != null and compareType != ''"> compare_type , </if>
+            <if test="filedVaule != null and filedVaule != ''"> filed_vaule , </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>
@@ -203,7 +168,7 @@
             <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="coordinate != null and coordinate != ''"> coordinate , </if>
+            <if test="companyId != null and companyId != ''"> company_id , </if>
     <if test="sts == null ">sts,</if>
   </trim>
   )values(
@@ -212,15 +177,10 @@
             <if test="mdmId != null and mdmId != ''"> #{mdmId} ,</if>
             <if test="distributeId != null and distributeId != ''"> #{distributeId} ,</if>
             <if test="apiId != null and apiId != ''"> #{apiId} ,</if>
-            <if test="sourceField != null and sourceField != ''"> #{sourceField} ,</if>
-            <if test="sourceName != null and sourceName != ''"> #{sourceName} ,</if>
-            <if test="targetField != null and targetField != ''"> #{targetField} ,</if>
-            <if test="targetName != null and targetName != ''"> #{targetName} ,</if>
-            <if test="defaultVaule != null and defaultVaule != ''"> #{defaultVaule} ,</if>
-            <if test="sourceFieldPath != null and sourceFieldPath != ''"> #{sourceFieldPath} ,</if>
-            <if test="targetFieldPath != null and targetFieldPath != ''"> #{targetFieldPath} ,</if>
-            <if test="targetPath != null and targetPath != ''"> #{targetPath} ,</if>
-            <if test="sourcePath != null and sourcePath != ''"> #{sourcePath} ,</if>
+            <if test="dataType != null and dataType != ''"> #{dataType} ,</if>
+            <if test="filedName != null and filedName != ''"> #{filedName} ,</if>
+            <if test="compareType != null and compareType != ''"> #{compareType} ,</if>
+            <if test="filedVaule != null and filedVaule != ''"> #{filedVaule} ,</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>
@@ -228,47 +188,41 @@
             <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="coordinate != null and coordinate != ''"> #{coordinate} ,</if>
+            <if test="companyId != null and companyId != ''"> #{companyId} ,</if>
     <if test="sts == null ">'Y',</if>
   </trim>
   )  
 </insert>
 <!-- 批量新增 -->
 <insert id="entityInsertBatch"  >
-  insert into mdm_module_distribute_detail(mdm_id, distribute_id, api_id, source_field, source_name, target_field, target_name, default_vaule, source_field_path, target_field_path, target_path, source_path, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, coordinate,  sts) 
+  insert into mdm_module_distribute_detail(mdm_id, distribute_id, api_id, data_type, filed_name, compare_type, filed_vaule, 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.distributeId},#{entity.apiId},#{entity.sourceField},#{entity.sourceName},#{entity.targetField},#{entity.targetName},#{entity.defaultVaule},#{entity.sourceFieldPath},#{entity.targetFieldPath},#{entity.targetPath},#{entity.sourcePath},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.coordinate}, 'Y')
+    (#{entity.mdmId},#{entity.distributeId},#{entity.apiId},#{entity.dataType},#{entity.filedName},#{entity.compareType},#{entity.filedVaule},#{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_distribute_detail(mdm_id, distribute_id, api_id, source_field, source_name, target_field, target_name, default_vaule, source_field_path, target_field_path, target_path, source_path, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, coordinate)
+    insert into mdm_module_distribute_detail(mdm_id, distribute_id, api_id, data_type, filed_name, compare_type, filed_vaule, 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.distributeId},#{entity.apiId},#{entity.sourceField},#{entity.sourceName},#{entity.targetField},#{entity.targetName},#{entity.defaultVaule},#{entity.sourceFieldPath},#{entity.targetFieldPath},#{entity.targetPath},#{entity.sourcePath},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.coordinate})
+    (#{entity.mdmId},#{entity.distributeId},#{entity.apiId},#{entity.dataType},#{entity.filedName},#{entity.compareType},#{entity.filedVaule},#{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),
     distribute_id = values(distribute_id),
     api_id = values(api_id),
-    source_field = values(source_field),
-    source_name = values(source_name),
-    target_field = values(target_field),
-    target_name = values(target_name),
-    default_vaule = values(default_vaule),
-    source_field_path = values(source_field_path),
-    target_field_path = values(target_field_path),
-    target_path = values(target_path),
-    source_path = values(source_path),
-    sorts = values(sorts),
+    data_type = values(data_type),
+    filed_name = values(filed_name),
+    compare_type = values(compare_type),
+    filed_vaule = values(filed_vaule),
     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),
-    coordinate = values(coordinate)</insert>
+    company_id = values(company_id)</insert>
 <!--通过主键修改方法-->
 <update id="entity_update" parameterType = "com.hzya.frame.mdm.mdmModuleDistributeDetail.entity.MdmModuleDistributeDetailEntity" >
 update mdm_module_distribute_detail  set
@@ -276,23 +230,17 @@ update mdm_module_distribute_detail  set
   <if test="mdmId != null and mdmId != ''"> mdm_id = #{mdmId},</if>
   <if test="distributeId != null and distributeId != ''"> distribute_id = #{distributeId},</if>
   <if test="apiId != null and apiId != ''"> api_id = #{apiId},</if>
-  <if test="sourceField != null and sourceField != ''"> source_field = #{sourceField},</if>
-  <if test="sourceName != null and sourceName != ''"> source_name = #{sourceName},</if>
-  <if test="targetField != null and targetField != ''"> target_field = #{targetField},</if>
-  <if test="targetName != null and targetName != ''"> target_name = #{targetName},</if>
-  <if test="defaultVaule != null and defaultVaule != ''"> default_vaule = #{defaultVaule},</if>
-  <if test="sourceFieldPath != null and sourceFieldPath != ''"> source_field_path = #{sourceFieldPath},</if>
-  <if test="targetFieldPath != null and targetFieldPath != ''"> target_field_path = #{targetFieldPath},</if>
-  <if test="targetPath != null and targetPath != ''"> target_path = #{targetPath},</if>
-  <if test="sourcePath != null and sourcePath != ''"> source_path = #{sourcePath},</if>
-  <if test="sorts != null"> sorts = #{sorts},</if>
+  <if test="dataType != null and dataType != ''"> data_type = #{dataType},</if>
+  <if test="filedName != null and filedName != ''"> filed_name = #{filedName},</if>
+  <if test="compareType != null and compareType != ''"> compare_type = #{compareType},</if>
+  <if test="filedVaule != null and filedVaule != ''"> filed_vaule = #{filedVaule},</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="coordinate != null and coordinate != ''"> coordinate = #{coordinate},</if>
+    <if test="companyId != null and companyId != ''"> company_id = #{companyId},</if>
 </trim>
 where id = #{id}
 </update>
@@ -309,18 +257,13 @@ update mdm_module_distribute_detail  set sts= 'N' ,modify_time = #{modify_time},
             <if test="mdmId != null and mdmId != ''"> and mdm_id = #{mdmId} </if>
             <if test="distributeId != null and distributeId != ''"> and distribute_id = #{distributeId} </if>
             <if test="apiId != null and apiId != ''"> and api_id = #{apiId} </if>
-            <if test="sourceField != null and sourceField != ''"> and source_field = #{sourceField} </if>
-            <if test="sourceName != null and sourceName != ''"> and source_name = #{sourceName} </if>
-            <if test="targetField != null and targetField != ''"> and target_field = #{targetField} </if>
-            <if test="targetName != null and targetName != ''"> and target_name = #{targetName} </if>
-            <if test="defaultVaule != null and defaultVaule != ''"> and default_vaule = #{defaultVaule} </if>
-            <if test="sourceFieldPath != null and sourceFieldPath != ''"> and source_field_path = #{sourceFieldPath} </if>
-            <if test="targetFieldPath != null and targetFieldPath != ''"> and target_field_path = #{targetFieldPath} </if>
-            <if test="targetPath != null and targetPath != ''"> and target_path = #{targetPath} </if>
-            <if test="sourcePath != null and sourcePath != ''"> and source_path = #{sourcePath} </if>
+            <if test="dataType != null and dataType != ''"> and data_type = #{dataType} </if>
+            <if test="filedName != null and filedName != ''"> and filed_name = #{filedName} </if>
+            <if test="compareType != null and compareType != ''"> and compare_type = #{compareType} </if>
+            <if test="filedVaule != null and filedVaule != ''"> and filed_vaule = #{filedVaule} </if>
             <if test="sorts != null"> and sorts = #{sorts} </if>
                                                                 <if test="sts != null and sts != ''"> and sts = #{sts} </if>
-                         <if test="coordinate != null and coordinate != ''"> and coordinate = #{coordinate} </if>
+                         <if test="companyId != null and companyId != ''"> and company_id = #{companyId} </if>
             and sts='Y'
     </trim>
 </update>

service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/service/IMdmModuleDistributeDetailService.java

@@ -6,7 +6,7 @@ import com.hzya.frame.basedao.service.IBaseService;
  * 主数据功能应用分发明细表(MdmModuleDistributeDetail)表服务接口
  *
  * @author makejava
- * @since 2023-11-07 09:11:31
+ * @since 2024-06-03 08:48:18
  */
 public interface IMdmModuleDistributeDetailService extends IBaseService<MdmModuleDistributeDetailEntity, String>{
 }

service/src/main/java/com/hzya/frame/mdm/mdmModuleDistributeDetail/service/impl/MdmModuleDistributeDetailServiceImpl.java

@@ -11,7 +11,7 @@ import com.hzya.frame.basedao.service.impl.BaseService;
  * 主数据功能应用分发明细表(MdmModuleDistributeDetail)表服务实现类
  *
  * @author makejava
- * @since 2023-11-07 09:11:31
+ * @since 2024-06-03 08:48:18
  */
 @Service(value = "mdmModuleDistributeDetailService")
 public class MdmModuleDistributeDetailServiceImpl extends BaseService<MdmModuleDistributeDetailEntity, String> implements IMdmModuleDistributeDetailService {

service/src/main/java/com/hzya/frame/mdm/mdmModuleOptionLog/dao/IMdmModuleOptionLogDao.java

@@ -0,0 +1,15 @@
+package com.hzya.frame.mdm.mdmModuleOptionLog.dao;
+
+import com.hzya.frame.mdm.mdmModuleOptionLog.entity.MdmModuleOptionLogEntity;
+import com.hzya.frame.basedao.dao.IBaseDao; 
+
+/**
+ * 主数据模版(mdm_module_option_log: table)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-06-05 16:10:31
+ */
+public interface IMdmModuleOptionLogDao extends IBaseDao<MdmModuleOptionLogEntity, String> {
+
+}
+

service/src/main/java/com/hzya/frame/mdm/mdmModuleOptionLog/dao/impl/MdmModuleOptionLogDaoImpl.java

@@ -0,0 +1,17 @@
+package com.hzya.frame.mdm.mdmModuleOptionLog.dao.impl;
+
+import com.hzya.frame.mdm.mdmModuleOptionLog.entity.MdmModuleOptionLogEntity;
+import com.hzya.frame.mdm.mdmModuleOptionLog.dao.IMdmModuleOptionLogDao;
+import org.springframework.stereotype.Repository;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+/**
+ * 主数据模版(MdmModuleOptionLog)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-06-05 16:10:31
+ */
+@Repository(value = "MdmModuleOptionLogDaoImpl")
+public class MdmModuleOptionLogDaoImpl extends MybatisGenericDao<MdmModuleOptionLogEntity, String> implements IMdmModuleOptionLogDao{
+ 
+}
+

service/src/main/java/com/hzya/frame/mdm/mdmModuleOptionLog/entity/MdmModuleOptionLogEntity.java

@@ -0,0 +1,104 @@
+package com.hzya.frame.mdm.mdmModuleOptionLog.entity;
+
+import java.util.Date;
+import com.hzya.frame.web.entity.BaseEntity;
+/**
+ * 主数据模版(MdmModuleOptionLog)实体类
+ *
+ * @author makejava
+ * @since 2024-06-05 16:10:32
+ */
+public class MdmModuleOptionLogEntity extends BaseEntity {
+    //主数据表名
+    private String tableName;
+    //主数据编码
+    private Long mdmCode;
+  /**  主表id */
+   private String formmainId;
+  /**  来源名称 */
+   private String sourceName;
+  /**  编码 */
+   private String code;
+  /**  source_data */
+   private String sourceData;
+  /**  操作类型 */
+   private String optionType;
+  /**  操作人 */
+   private String optionName;
+  /**  公司id */
+   private String companyId;
+
+
+    public String getFormmainId() {
+        return formmainId;
+    }
+
+    public void setFormmainId(String formmainId) {
+        this.formmainId = formmainId;
+    }
+
+    public String getSourceName() {
+        return sourceName;
+    }
+
+    public void setSourceName(String sourceName) {
+        this.sourceName = sourceName;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getSourceData() {
+        return sourceData;
+    }
+
+    public void setSourceData(String sourceData) {
+        this.sourceData = sourceData;
+    }
+
+    public String getOptionType() {
+        return optionType;
+    }
+
+    public void setOptionType(String optionType) {
+        this.optionType = optionType;
+    }
+
+    public String getOptionName() {
+        return optionName;
+    }
+
+    public void setOptionName(String optionName) {
+        this.optionName = optionName;
+    }
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
+    public Long getMdmCode() {
+        return mdmCode;
+    }
+
+    public void setMdmCode(Long mdmCode) {
+        this.mdmCode = mdmCode;
+    }
+}
+

service/src/main/java/com/hzya/frame/mdm/mdmModuleOptionLog/entity/MdmModuleOptionLogEntity.xml

@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hzya.frame.mdm.mdmModuleOptionLog.dao.impl.MdmModuleOptionLogDaoImpl">
+
+    <resultMap id="get-MdmModuleOptionLogEntity-result" type="com.hzya.frame.mdm.mdmModuleOptionLog.entity.MdmModuleOptionLogEntity" >
+       <result property="id" column="id" jdbcType="VARCHAR"/>
+           <result property="formmainId" column="formmain_id" jdbcType="VARCHAR"/>
+           <result property="sourceName" column="source_name" jdbcType="VARCHAR"/>
+           <result property="code" column="code" jdbcType="VARCHAR"/>
+           <result property="sourceData" column="source_data" jdbcType="VARCHAR"/>
+           <result property="optionType" column="option_type" jdbcType="VARCHAR"/>
+           <result property="optionName" column="option_name" 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 = "MdmModuleOptionLogEntity_Base_Column_List">
+        id
+       ,formmain_id 
+        ,source_name 
+        ,code 
+        ,source_data 
+        ,option_type 
+        ,option_name 
+        ,sorts 
+        ,create_user_id 
+        ,create_time 
+        ,modify_user_id 
+        ,modify_time 
+        ,sts 
+        ,org_id 
+        ,company_id 
+     </sql>
+    <select id="entity_get" resultMap="get-MdmModuleOptionLogEntity-result">
+        select
+        <include refid="MdmModuleOptionLogEntity_Base_Column_List" />
+        from ${tableName} where id = #{ id } and sts='Y'
+    </select>
+ <!-- 查询 采用==查询 -->
+ <select id="entity_list_base" resultMap="get-MdmModuleOptionLogEntity-result" parameterType = "com.hzya.frame.mdm.mdmModuleOptionLog.entity.MdmModuleOptionLogEntity">
+    select
+    <include refid="MdmModuleOptionLogEntity_Base_Column_List" />
+    from ${tableName}
+    <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id = #{id} </if>
+            <if test="formmainId != null and formmainId != ''"> and formmain_id = #{formmainId} </if>
+            <if test="sourceName != null and sourceName != ''"> and source_name = #{sourceName} </if>
+            <if test="code != null and code != ''"> and code = #{code} </if>
+            <if test="sourceData != null and sourceData != ''"> and source_data = #{sourceData} </if>
+            <if test="optionType != null and optionType != ''"> and option_type = #{optionType} </if>
+            <if test="optionName != null and optionName != ''"> and option_name = #{optionName} </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.mdmModuleOptionLog.entity.MdmModuleOptionLogEntity">
+        select  count(1)   from ${tableName}
+    <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id = #{id} </if>
+            <if test="formmainId != null and formmainId != ''"> and formmain_id = #{formmainId} </if>
+            <if test="sourceName != null and sourceName != ''"> and source_name = #{sourceName} </if>
+            <if test="code != null and code != ''"> and code = #{code} </if>
+            <if test="sourceData != null and sourceData != ''"> and source_data = #{sourceData} </if>
+            <if test="optionType != null and optionType != ''"> and option_type = #{optionType} </if>
+            <if test="optionName != null and optionName != ''"> and option_name = #{optionName} </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>
+
+    <!-- 分页查询列表 采用like格式 -->
+<select id="entity_list_like" resultMap="get-MdmModuleOptionLogEntity-result" parameterType = "com.hzya.frame.mdm.mdmModuleOptionLog.entity.MdmModuleOptionLogEntity">
+    select
+    <include refid="MdmModuleOptionLogEntity_Base_Column_List" />
+    from ${tableName}
+    <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id like concat('%',#{id},'%') </if>
+            <if test="formmainId != null and formmainId != ''"> and formmain_id like concat('%',#{formmainId},'%') </if>
+            <if test="sourceName != null and sourceName != ''"> and source_name like concat('%',#{sourceName},'%') </if>
+            <if test="code != null and code != ''"> and code like concat('%',#{code},'%') </if>
+            <if test="sourceData != null and sourceData != ''"> and source_data like concat('%',#{sourceData},'%') </if>
+            <if test="optionType != null and optionType != ''"> and option_type like concat('%',#{optionType},'%') </if>
+            <if test="optionName != null and optionName != ''"> and option_name like concat('%',#{optionName},'%') </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>
+
+<!-- 查询列表 字段采用or格式 -->
+<select id="MdmModuleOptionLogentity_list_or" resultMap="get-MdmModuleOptionLogEntity-result" parameterType = "com.hzya.frame.mdm.mdmModuleOptionLog.entity.MdmModuleOptionLogEntity">
+    select
+    <include refid="MdmModuleOptionLogEntity_Base_Column_List" />
+    from ${tableName}
+    <trim prefix="where" prefixOverrides="and"> 
+         <if test="id != null and id != ''"> or id = #{id} </if>
+             <if test="formmainId != null and formmainId != ''"> or formmain_id = #{formmainId} </if>
+             <if test="sourceName != null and sourceName != ''"> or source_name = #{sourceName} </if>
+             <if test="code != null and code != ''"> or code = #{code} </if>
+             <if test="sourceData != null and sourceData != ''"> or source_data = #{sourceData} </if>
+             <if test="optionType != null and optionType != ''"> or option_type = #{optionType} </if>
+             <if test="optionName != null and optionName != ''"> or option_name = #{optionName} </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>
+
+<!--新增所有列-->
+<insert id="entity_insert" parameterType = "com.hzya.frame.mdm.mdmModuleOptionLog.entity.MdmModuleOptionLogEntity" >
+    insert into ${tableName}(
+  <trim suffix="" suffixOverrides=",">
+       <if test="id != null and id != ''"> id , </if>
+            <if test="formmainId != null and formmainId != ''"> formmain_id , </if>
+            <if test="sourceName != null and sourceName != ''"> source_name , </if>
+            <if test="code != null and code != ''"> code , </if>
+            <if test="sourceData != null and sourceData != ''"> source_data , </if>
+            <if test="optionType != null and optionType != ''"> option_type , </if>
+            <if test="optionName != null and optionName != ''"> option_name , </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="sorts == null ">sorts,</if>
+    <if test="sts == null ">sts,</if>
+  </trim>
+  )values(
+ <trim suffix="" suffixOverrides=",">
+       <if test="id != null and id != ''"> #{id} ,</if>
+            <if test="formmainId != null and formmainId != ''"> #{formmainId} ,</if>
+            <if test="sourceName != null and sourceName != ''"> #{sourceName} ,</if>
+            <if test="code != null and code != ''"> #{code} ,</if>
+            <if test="sourceData != null and sourceData != ''"> #{sourceData} ,</if>
+            <if test="optionType != null and optionType != ''"> #{optionType} ,</if>
+            <if test="optionName != null and optionName != ''"> #{optionName} ,</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="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from ${tableName} a WHERE a.sts = 'Y' ),</if>
+    <if test="sts == null ">'Y',</if>
+  </trim>
+  )  
+</insert>
+<!-- 批量新增 -->
+<insert id="entityInsertBatch" >
+  insert into ${tableName}(formmain_id, source_name, code, source_data, option_type, option_name, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id,  sts)
+    values
+    <foreach collection="entities" item="entity" separator=",">
+    (#{entity.formmainId},#{entity.sourceName},#{entity.code},#{entity.sourceData},#{entity.optionType},#{entity.optionName},#{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 ${tableName}(formmain_id, source_name, code, source_data, option_type, option_name, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id)
+    values
+    <foreach collection="entities" item="entity" separator=",">
+    (#{entity.formmainId},#{entity.sourceName},#{entity.code},#{entity.sourceData},#{entity.optionType},#{entity.optionName},#{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
+    formmain_id = values(formmain_id),
+    source_name = values(source_name),
+    code = values(code),
+    source_data = values(source_data),
+    option_type = values(option_type),
+    option_name = values(option_name),
+    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.mdmModuleOptionLog.entity.MdmModuleOptionLogEntity" >
+update ${tableName}  set
+<trim suffix="" suffixOverrides=",">
+  <if test="formmainId != null and formmainId != ''"> formmain_id = #{formmainId},</if>
+  <if test="sourceName != null and sourceName != ''"> source_name = #{sourceName},</if>
+  <if test="code != null and code != ''"> code = #{code},</if>
+  <if test="sourceData != null and sourceData != ''"> source_data = #{sourceData},</if>
+  <if test="optionType != null and optionType != ''"> option_type = #{optionType},</if>
+  <if test="optionName != null and optionName != ''"> option_name = #{optionName},</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.mdmModuleOptionLog.entity.MdmModuleOptionLogEntity" >
+update ${tableName}  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.mdmModuleOptionLog.entity.MdmModuleOptionLogEntity" >
+update ${tableName}  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="formmainId != null and formmainId != ''"> and formmain_id = #{formmainId} </if>
+            <if test="sourceName != null and sourceName != ''"> and source_name = #{sourceName} </if>
+            <if test="code != null and code != ''"> and code = #{code} </if>
+            <if test="sourceData != null and sourceData != ''"> and source_data = #{sourceData} </if>
+            <if test="optionType != null and optionType != ''"> and option_type = #{optionType} </if>
+            <if test="optionName != null and optionName != ''"> and option_name = #{optionName} </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 ${tableName} where id = #{id}
+</delete>
+
+</mapper>
+

service/src/main/java/com/hzya/frame/mdm/mdmModuleRole/dao/IMdmModuleRoleDao.java

@@ -1,15 +0,0 @@
-package com.hzya.frame.mdm.mdmModuleRole.dao;
-
-import com.hzya.frame.mdm.mdmModuleRole.entity.MdmModuleRoleEntity;
-import com.hzya.frame.basedao.dao.IBaseDao;
-
-/**
- * 主数据功能角色表(mdm_module_role: table)表数据库访问层
- *
- * @author makejava
- * @since 2023-10-17 15:32:25
- */
-public interface IMdmModuleRoleDao extends IBaseDao<MdmModuleRoleEntity, String> {
-
-}
-

service/src/main/java/com/hzya/frame/mdm/mdmModuleRole/dao/impl/MdmModuleRoleDaoImpl.java

@@ -1,18 +0,0 @@
-package com.hzya.frame.mdm.mdmModuleRole.dao.impl;
-
-import com.hzya.frame.mdm.mdmModuleRole.entity.MdmModuleRoleEntity;
-import com.hzya.frame.mdm.mdmModuleRole.dao.IMdmModuleRoleDao;
-import org.springframework.stereotype.Repository;
-import com.hzya.frame.basedao.dao.MybatisGenericDao;
-
-/**
- * 主数据功能角色表(MdmModuleRole)表数据库访问层
- *
- * @author makejava
- * @since 2023-10-17 15:32:25
- */
-@Repository(value = "MdmModuleRoleDaoImpl")
-public class MdmModuleRoleDaoImpl extends MybatisGenericDao<MdmModuleRoleEntity, String> implements IMdmModuleRoleDao {
-
-}
-

service/src/main/java/com/hzya/frame/mdm/mdmModuleRole/entity/MdmModuleRoleEntity.java

@@ -1,52 +0,0 @@
-package com.hzya.frame.mdm.mdmModuleRole.entity;
-
-import java.util.Date;
-import java.util.List;
-
-import com.hzya.frame.mdm.mdmModuleRoleButton.entity.MdmModuleRoleButtonEntity;
-import com.hzya.frame.web.entity.BaseEntity;
-
-/**
- * 主数据功能角色表(MdmModuleRole)实体类
- *
- * @author makejava
- * @since 2023-10-17 15:32:25
- */
-public class MdmModuleRoleEntity extends BaseEntity {
-
-    /**
-     * 主数据模版ID
-     */
-    private String mdmId;
-    /**
-     * 角色id
-     */
-    private String roleId;
-
-    //角色按钮
-    private List<MdmModuleRoleButtonEntity> mdmModuleRoleButtonEntities;
-    public String getMdmId() {
-        return mdmId;
-    }
-
-    public void setMdmId(String mdmId) {
-        this.mdmId = mdmId;
-    }
-
-    public String getRoleId() {
-        return roleId;
-    }
-
-    public void setRoleId(String roleId) {
-        this.roleId = roleId;
-    }
-
-    public List<MdmModuleRoleButtonEntity> getMdmModuleRoleButtonEntities() {
-        return mdmModuleRoleButtonEntities;
-    }
-
-    public void setMdmModuleRoleButtonEntities(List<MdmModuleRoleButtonEntity> mdmModuleRoleButtonEntities) {
-        this.mdmModuleRoleButtonEntities = mdmModuleRoleButtonEntities;
-    }
-}
-

service/src/main/java/com/hzya/frame/mdm/mdmModuleRole/entity/MdmModuleRoleEntity.xml

@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hzya.frame.mdm.mdmModuleRole.dao.impl.MdmModuleRoleDaoImpl">
-
-    <resultMap id="get-MdmModuleRoleEntity-result" type="com.hzya.frame.mdm.mdmModuleRole.entity.MdmModuleRoleEntity">
-        <result property="id" column="id" jdbcType="VARCHAR"/>
-        <result property="mdmId" column="mdm_id" jdbcType="VARCHAR"/>
-        <result property="roleId" column="role_id" 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"/>
-    </resultMap>
-    <!-- 查询的字段-->
-    <sql id="MdmModuleRoleEntity_Base_Column_List">
-        id
-       ,mdm_id 
-        ,role_id 
-        ,sorts 
-        ,create_user_id 
-        ,create_time 
-        ,modify_user_id 
-        ,modify_time 
-        ,sts 
-        ,org_id 
-     </sql>
-    <!-- 查询 采用==查询 -->
-    <select id="entity_list_base" resultMap="get-MdmModuleRoleEntity-result"
-            parameterType="com.hzya.frame.mdm.mdmModuleRole.entity.MdmModuleRoleEntity">
-        select
-        <include refid="MdmModuleRoleEntity_Base_Column_List"/>
-        from mdm_module_role
-        <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="roleId != null and roleId != ''">and role_id = #{roleId}</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>
-            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.mdmModuleRole.entity.MdmModuleRoleEntity">
-        select count(1) from mdm_module_role
-        <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="roleId != null and roleId != ''">and role_id = #{roleId}</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>
-            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>
-
-    <!-- 分页查询列表 采用like格式 -->
-    <select id="entity_list_like" resultMap="get-MdmModuleRoleEntity-result"
-            parameterType="com.hzya.frame.mdm.mdmModuleRole.entity.MdmModuleRoleEntity">
-        select
-        <include refid="MdmModuleRoleEntity_Base_Column_List"/>
-        from mdm_module_role
-        <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="roleId != null and roleId != ''">and role_id like concat('%',#{roleId},'%')</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>
-            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>
-
-    <!-- 查询列表 字段采用or格式 -->
-    <select id="MdmModuleRoleentity_list_or" resultMap="get-MdmModuleRoleEntity-result"
-            parameterType="com.hzya.frame.mdm.mdmModuleRole.entity.MdmModuleRoleEntity">
-        select
-        <include refid="MdmModuleRoleEntity_Base_Column_List"/>
-        from mdm_module_role
-        <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="roleId != null and roleId != ''">or role_id = #{roleId}</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>
-            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>
-
-    <!--新增所有列-->
-    <insert id="entity_insert" parameterType="com.hzya.frame.mdm.mdmModuleRole.entity.MdmModuleRoleEntity"
-            >
-        insert into mdm_module_role(
-        <trim suffix="" suffixOverrides=",">
-            <if test="id != null and id != ''">id ,</if>
-            <if test="mdmId != null and mdmId != ''">mdm_id ,</if>
-            <if test="roleId != null and roleId != ''">role_id ,</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="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="roleId != null and roleId != ''">#{roleId} ,</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="sts == null ">'Y',</if>
-        </trim>
-        )
-    </insert>
-    <!-- 批量新增 -->
-    <insert id="entityInsertBatch" >
-        insert into mdm_module_role(mdm_id, role_id, sorts, create_user_id, create_time, modify_user_id, modify_time,
-        sts, org_id, sts)
-        values
-        <foreach collection="entities" item="entity" separator=",">
-            (#{entity.mdmId},#{entity.roleId},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},
-            'Y')
-        </foreach>
-    </insert>
-    <!-- 批量新增或者修改-->
-    <insert id="entityInsertOrUpdateBatch" >
-        insert into mdm_module_role(mdm_id, role_id, sorts, create_user_id, create_time, modify_user_id, modify_time,
-        sts, org_id)
-        values
-        <foreach collection="entities" item="entity" separator=",">
-            (#{entity.mdmId},#{entity.roleId},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id})
-        </foreach>
-        on duplicate key update
-        mdm_id = values(mdm_id),
-        role_id = values(role_id),
-        sorts = values(sorts),
-        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)
-    </insert>
-    <!--通过主键修改方法-->
-    <update id="entity_update" parameterType="com.hzya.frame.mdm.mdmModuleRole.entity.MdmModuleRoleEntity">
-        update mdm_module_role set
-        <trim suffix="" suffixOverrides=",">
-            <if test="mdmId != null and mdmId != ''">mdm_id = #{mdmId},</if>
-            <if test="roleId != null and roleId != ''">role_id = #{roleId},</if>
-            <if test="sorts != null">sorts = #{sorts},</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>
-        </trim>
-        where id = #{id}
-    </update>
-    <!-- 逻辑删除 -->
-    <update id="entity_logicDelete" parameterType="com.hzya.frame.mdm.mdmModuleRole.entity.MdmModuleRoleEntity">
-update mdm_module_role  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.mdmModuleRole.entity.MdmModuleRoleEntity">
-        update mdm_module_role 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="roleId != null and roleId != ''">and role_id = #{roleId}</if>
-            <if test="sorts != null">and sorts = #{sorts}</if>
-            <if test="sts != null and sts != ''">and sts = #{sts}</if>
-            and sts='Y'
-        </trim>
-    </update>
-    <!--通过主键删除-->
-    <delete id="entity_delete">
-    delete from mdm_module_role where id = #{id}
-</delete>
-
-</mapper>
-

service/src/main/java/com/hzya/frame/mdm/mdmModuleRole/service/IMdmModuleRoleService.java

@@ -1,13 +0,0 @@
-package com.hzya.frame.mdm.mdmModuleRole.service;
-
-import com.hzya.frame.mdm.mdmModuleRole.entity.MdmModuleRoleEntity;
-import com.hzya.frame.basedao.service.IBaseService;
-
-/**
- * 主数据功能角色表(MdmModuleRole)表服务接口
- *
- * @author makejava
- * @since 2023-10-17 15:32:26
- */
-public interface IMdmModuleRoleService extends IBaseService<MdmModuleRoleEntity, String> {
-}

service/src/main/java/com/hzya/frame/mdm/mdmModuleRole/service/impl/MdmModuleRoleServiceImpl.java

@@ -1,29 +0,0 @@
-package com.hzya.frame.mdm.mdmModuleRole.service.impl;
-
-import com.hzya.frame.mdm.mdmModuleRole.entity.MdmModuleRoleEntity;
-import com.hzya.frame.mdm.mdmModuleRole.dao.IMdmModuleRoleDao;
-import com.hzya.frame.mdm.mdmModuleRole.service.IMdmModuleRoleService;
-import org.springframework.stereotype.Service;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import javax.annotation.Resource;
-
-import com.hzya.frame.basedao.service.impl.BaseService;
-
-/**
- * 主数据功能角色表(MdmModuleRole)表服务实现类
- *
- * @author makejava
- * @since 2023-10-17 15:32:27
- */
-@Service(value = "mdmModuleRoleService")
-public class MdmModuleRoleServiceImpl extends BaseService<MdmModuleRoleEntity, String> implements IMdmModuleRoleService {
-
-    private IMdmModuleRoleDao mdmModuleRoleDao;
-
-    @Autowired
-    public void setMdmModuleRoleDao(IMdmModuleRoleDao dao) {
-        this.mdmModuleRoleDao = dao;
-        this.dao = dao;
-    }
-}

service/src/main/java/com/hzya/frame/mdm/mdmModuleRoleButton/dao/IMdmModuleRoleButtonDao.java

@@ -1,15 +0,0 @@
-package com.hzya.frame.mdm.mdmModuleRoleButton.dao;
-
-import com.hzya.frame.mdm.mdmModuleRoleButton.entity.MdmModuleRoleButtonEntity;
-import com.hzya.frame.basedao.dao.IBaseDao;
-
-/**
- * 主数据功能角色按钮表(mdm_module_role_button: table)表数据库访问层
- *
- * @author makejava
- * @since 2023-10-17 15:33:09
- */
-public interface IMdmModuleRoleButtonDao extends IBaseDao<MdmModuleRoleButtonEntity, String> {
-
-}
-

service/src/main/java/com/hzya/frame/mdm/mdmModuleRoleButton/dao/impl/MdmModuleRoleButtonDaoImpl.java

@@ -1,18 +0,0 @@
-package com.hzya.frame.mdm.mdmModuleRoleButton.dao.impl;
-
-import com.hzya.frame.mdm.mdmModuleRoleButton.entity.MdmModuleRoleButtonEntity;
-import com.hzya.frame.mdm.mdmModuleRoleButton.dao.IMdmModuleRoleButtonDao;
-import org.springframework.stereotype.Repository;
-import com.hzya.frame.basedao.dao.MybatisGenericDao;
-
-/**
- * 主数据功能角色按钮表(MdmModuleRoleButton)表数据库访问层
- *
- * @author makejava
- * @since 2023-10-17 15:33:10
- */
-@Repository(value = "MdmModuleRoleButtonDaoImpl")
-public class MdmModuleRoleButtonDaoImpl extends MybatisGenericDao<MdmModuleRoleButtonEntity, String> implements IMdmModuleRoleButtonDao {
-
-}
-

service/src/main/java/com/hzya/frame/mdm/mdmModuleRoleButton/entity/MdmModuleRoleButtonEntity.java

@@ -1,92 +0,0 @@
-package com.hzya.frame.mdm.mdmModuleRoleButton.entity;
-
-import java.util.Date;
-import java.util.List;
-
-import com.hzya.frame.sys.userRole.entity.UserRole;
-import com.hzya.frame.web.entity.BaseEntity;
-
-/**
- * 主数据功能角色按钮表(MdmModuleRoleButton)实体类
- *
- * @author makejava
- * @since 2023-10-17 15:33:10
- */
-public class MdmModuleRoleButtonEntity extends BaseEntity {
-
-    /**
-     * 主数据模版ID
-     */
-    private String mdmId;
-    /**
-     * 模块角色id
-     */
-    private String moduleRoleId;
-    /**
-     * 角色id
-     */
-    private String roleId;
-    /**
-     * 按钮类型
-     */
-    private String buttonType;
-    /**
-     * 按钮名
-     */
-    private String buttonName;
-
-    /**
-     * 角色ids
-     */
-    private List<UserRole> roleIds;
-
-    public List<UserRole> getRoleIds() {
-        return roleIds;
-    }
-
-    public void setRoleIds(List<UserRole> roleIds) {
-        this.roleIds = roleIds;
-    }
-
-    public String getMdmId() {
-        return mdmId;
-    }
-
-    public void setMdmId(String mdmId) {
-        this.mdmId = mdmId;
-    }
-
-    public String getModuleRoleId() {
-        return moduleRoleId;
-    }
-
-    public void setModuleRoleId(String moduleRoleId) {
-        this.moduleRoleId = moduleRoleId;
-    }
-
-    public String getRoleId() {
-        return roleId;
-    }
-
-    public void setRoleId(String roleId) {
-        this.roleId = roleId;
-    }
-
-    public String getButtonType() {
-        return buttonType;
-    }
-
-    public void setButtonType(String buttonType) {
-        this.buttonType = buttonType;
-    }
-
-    public String getButtonName() {
-        return buttonName;
-    }
-
-    public void setButtonName(String buttonName) {
-        this.buttonName = buttonName;
-    }
-
-}
-

service/src/main/java/com/hzya/frame/mdm/mdmModuleRoleButton/entity/MdmModuleRoleButtonEntity.xml

@@ -1,271 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hzya.frame.mdm.mdmModuleRoleButton.dao.impl.MdmModuleRoleButtonDaoImpl">
-
-    <resultMap id="get-MdmModuleRoleButtonEntity-result"
-               type="com.hzya.frame.mdm.mdmModuleRoleButton.entity.MdmModuleRoleButtonEntity">
-        <result property="id" column="id" jdbcType="VARCHAR"/>
-        <result property="mdmId" column="mdm_id" jdbcType="VARCHAR"/>
-        <result property="moduleRoleId" column="module_role_id" jdbcType="VARCHAR"/>
-        <result property="roleId" column="role_id" jdbcType="VARCHAR"/>
-        <result property="buttonType" column="button_type" jdbcType="VARCHAR"/>
-        <result property="buttonName" column="button_name" 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"/>
-    </resultMap>
-    <!-- 查询的字段-->
-    <sql id="MdmModuleRoleButtonEntity_Base_Column_List">
-        id
-       ,mdm_id 
-        ,module_role_id 
-        ,role_id 
-        ,button_type 
-        ,button_name 
-        ,sorts 
-        ,create_user_id 
-        ,create_time 
-        ,modify_user_id 
-        ,modify_time 
-        ,sts 
-        ,org_id 
-     </sql>
-    <!-- 查询 采用==查询 -->
-    <select id="entity_list_base" resultMap="get-MdmModuleRoleButtonEntity-result"
-            parameterType="com.hzya.frame.mdm.mdmModuleRoleButton.entity.MdmModuleRoleButtonEntity">
-        select
-        <include refid="MdmModuleRoleButtonEntity_Base_Column_List"/>
-        from mdm_module_role_button
-        <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="moduleRoleId != null and moduleRoleId != ''">and module_role_id = #{moduleRoleId}</if>
-            <if test="roleId != null and roleId != ''">and role_id = #{roleId}</if>
-            <if test="buttonType != null and buttonType != ''">and button_type = #{buttonType}</if>
-            <if test="buttonName != null and buttonName != ''">and button_name = #{buttonName}</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="roleIds != null and roleIds.size > 0">
-                and (
-                <foreach collection="roleIds" index="index" item="item" separator="or">
-                    role_id = #{item.roleId}
-                </foreach>
-                )
-            </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.mdmModuleRoleButton.entity.MdmModuleRoleButtonEntity">
-        select count(1) from mdm_module_role_button
-        <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="moduleRoleId != null and moduleRoleId != ''">and module_role_id = #{moduleRoleId}</if>
-            <if test="roleId != null and roleId != ''">and role_id = #{roleId}</if>
-            <if test="buttonType != null and buttonType != ''">and button_type = #{buttonType}</if>
-            <if test="buttonName != null and buttonName != ''">and button_name = #{buttonName}</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>
-            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>
-
-    <!-- 分页查询列表 采用like格式 -->
-    <select id="entity_list_like" resultMap="get-MdmModuleRoleButtonEntity-result"
-            parameterType="com.hzya.frame.mdm.mdmModuleRoleButton.entity.MdmModuleRoleButtonEntity">
-        select
-        <include refid="MdmModuleRoleButtonEntity_Base_Column_List"/>
-        from mdm_module_role_button
-        <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="moduleRoleId != null and moduleRoleId != ''">and module_role_id like
-                concat('%',#{moduleRoleId},'%')
-            </if>
-            <if test="roleId != null and roleId != ''">and role_id like concat('%',#{roleId},'%')</if>
-            <if test="buttonType != null and buttonType != ''">and button_type like concat('%',#{buttonType},'%')</if>
-            <if test="buttonName != null and buttonName != ''">and button_name like concat('%',#{buttonName},'%')</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>
-            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>
-
-    <!-- 查询列表 字段采用or格式 -->
-    <select id="MdmModuleRoleButtonentity_list_or" resultMap="get-MdmModuleRoleButtonEntity-result"
-            parameterType="com.hzya.frame.mdm.mdmModuleRoleButton.entity.MdmModuleRoleButtonEntity">
-        select
-        <include refid="MdmModuleRoleButtonEntity_Base_Column_List"/>
-        from mdm_module_role_button
-        <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="moduleRoleId != null and moduleRoleId != ''">or module_role_id = #{moduleRoleId}</if>
-            <if test="roleId != null and roleId != ''">or role_id = #{roleId}</if>
-            <if test="buttonType != null and buttonType != ''">or button_type = #{buttonType}</if>
-            <if test="buttonName != null and buttonName != ''">or button_name = #{buttonName}</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>
-            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>
-
-    <!--新增所有列-->
-    <insert id="entity_insert" parameterType="com.hzya.frame.mdm.mdmModuleRoleButton.entity.MdmModuleRoleButtonEntity"
-            >
-        insert into mdm_module_role_button(
-        <trim suffix="" suffixOverrides=",">
-            <if test="id != null and id != ''">id ,</if>
-            <if test="mdmId != null and mdmId != ''">mdm_id ,</if>
-            <if test="moduleRoleId != null and moduleRoleId != ''">module_role_id ,</if>
-            <if test="roleId != null and roleId != ''">role_id ,</if>
-            <if test="buttonType != null and buttonType != ''">button_type ,</if>
-            <if test="buttonName != null and buttonName != ''">button_name ,</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="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="moduleRoleId != null and moduleRoleId != ''">#{moduleRoleId} ,</if>
-            <if test="roleId != null and roleId != ''">#{roleId} ,</if>
-            <if test="buttonType != null and buttonType != ''">#{buttonType} ,</if>
-            <if test="buttonName != null and buttonName != ''">#{buttonName} ,</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="sts == null ">'Y',</if>
-        </trim>
-        )
-    </insert>
-    <!-- 批量新增 -->
-    <insert id="entityInsertBatch" >
-        insert into mdm_module_role_button(mdm_id, module_role_id, role_id, button_type, button_name, sorts,
-        create_user_id, create_time, modify_user_id, modify_time, sts, org_id, sts)
-        values
-        <foreach collection="entities" item="entity" separator=",">
-            (#{entity.mdmId},#{entity.moduleRoleId},#{entity.roleId},#{entity.buttonType},#{entity.buttonName},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},
-            'Y')
-        </foreach>
-    </insert>
-    <!-- 批量新增或者修改-->
-    <insert id="entityInsertOrUpdateBatch" >
-        insert into mdm_module_role_button(mdm_id, module_role_id, role_id, button_type, button_name, sorts,
-        create_user_id, create_time, modify_user_id, modify_time, sts, org_id)
-        values
-        <foreach collection="entities" item="entity" separator=",">
-            (#{entity.mdmId},#{entity.moduleRoleId},#{entity.roleId},#{entity.buttonType},#{entity.buttonName},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id})
-        </foreach>
-        on duplicate key update
-        mdm_id = values(mdm_id),
-        module_role_id = values(module_role_id),
-        role_id = values(role_id),
-        button_type = values(button_type),
-        button_name = values(button_name),
-        sorts = values(sorts),
-        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)
-    </insert>
-    <!--通过主键修改方法-->
-    <update id="entity_update" parameterType="com.hzya.frame.mdm.mdmModuleRoleButton.entity.MdmModuleRoleButtonEntity">
-        update mdm_module_role_button set
-        <trim suffix="" suffixOverrides=",">
-            <if test="mdmId != null and mdmId != ''">mdm_id = #{mdmId},</if>
-            <if test="moduleRoleId != null and moduleRoleId != ''">module_role_id = #{moduleRoleId},</if>
-            <if test="roleId != null and roleId != ''">role_id = #{roleId},</if>
-            <if test="buttonType != null and buttonType != ''">button_type = #{buttonType},</if>
-            <if test="buttonName != null and buttonName != ''">button_name = #{buttonName},</if>
-            <if test="sorts != null">sorts = #{sorts},</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>
-        </trim>
-        where id = #{id}
-    </update>
-    <!-- 逻辑删除 -->
-    <update id="entity_logicDelete"
-            parameterType="com.hzya.frame.mdm.mdmModuleRoleButton.entity.MdmModuleRoleButtonEntity">
-update mdm_module_role_button  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.mdmModuleRoleButton.entity.MdmModuleRoleButtonEntity">
-        update mdm_module_role_button 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="moduleRoleId != null and moduleRoleId != ''">and module_role_id = #{moduleRoleId}</if>
-            <if test="roleId != null and roleId != ''">and role_id = #{roleId}</if>
-            <if test="buttonType != null and buttonType != ''">and button_type = #{buttonType}</if>
-            <if test="buttonName != null and buttonName != ''">and button_name = #{buttonName}</if>
-            <if test="sorts != null">and sorts = #{sorts}</if>
-            <if test="sts != null and sts != ''">and sts = #{sts}</if>
-            and sts='Y'
-        </trim>
-    </update>
-    <!--通过主键删除-->
-    <delete id="entity_delete">
-    delete from mdm_module_role_button where id = #{id}
-</delete>
-
-</mapper>
-

service/src/main/java/com/hzya/frame/mdm/mdmModuleRoleButton/service/IMdmModuleRoleButtonService.java

@@ -1,13 +0,0 @@
-package com.hzya.frame.mdm.mdmModuleRoleButton.service;
-
-import com.hzya.frame.mdm.mdmModuleRoleButton.entity.MdmModuleRoleButtonEntity;
-import com.hzya.frame.basedao.service.IBaseService;
-
-/**
- * 主数据功能角色按钮表(MdmModuleRoleButton)表服务接口
- *
- * @author makejava
- * @since 2023-10-17 15:33:11
- */
-public interface IMdmModuleRoleButtonService extends IBaseService<MdmModuleRoleButtonEntity, String> {
-}

service/src/main/java/com/hzya/frame/mdm/mdmModuleRoleButton/service/impl/MdmModuleRoleButtonServiceImpl.java

@@ -1,29 +0,0 @@
-package com.hzya.frame.mdm.mdmModuleRoleButton.service.impl;
-
-import com.hzya.frame.mdm.mdmModuleRoleButton.entity.MdmModuleRoleButtonEntity;
-import com.hzya.frame.mdm.mdmModuleRoleButton.dao.IMdmModuleRoleButtonDao;
-import com.hzya.frame.mdm.mdmModuleRoleButton.service.IMdmModuleRoleButtonService;
-import org.springframework.stereotype.Service;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import javax.annotation.Resource;
-
-import com.hzya.frame.basedao.service.impl.BaseService;
-
-/**
- * 主数据功能角色按钮表(MdmModuleRoleButton)表服务实现类
- *
- * @author makejava
- * @since 2023-10-17 15:33:12
- */
-@Service(value = "mdmModuleRoleButtonService")
-public class MdmModuleRoleButtonServiceImpl extends BaseService<MdmModuleRoleButtonEntity, String> implements IMdmModuleRoleButtonService {
-
-    private IMdmModuleRoleButtonDao mdmModuleRoleButtonDao;
-
-    @Autowired
-    public void setMdmModuleRoleButtonDao(IMdmModuleRoleButtonDao dao) {
-        this.mdmModuleRoleButtonDao = dao;
-        this.dao = dao;
-    }
-}

service/src/main/java/com/hzya/frame/mdm/mdmModuleSendLog/dao/IMdmModuleSendLogDao.java

@@ -0,0 +1,15 @@
+package com.hzya.frame.mdm.mdmModuleSendLog.dao;
+
+import com.hzya.frame.mdm.mdmModuleSendLog.entity.MdmModuleSendLogEntity;
+import com.hzya.frame.basedao.dao.IBaseDao; 
+
+/**
+ * 主数据模版(mdm_module_send_log: table)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-06-05 16:11:09
+ */
+public interface IMdmModuleSendLogDao extends IBaseDao<MdmModuleSendLogEntity, String> {
+
+}
+

service/src/main/java/com/hzya/frame/mdm/mdmModuleSendLog/dao/impl/MdmModuleSendLogDaoImpl.java

@@ -0,0 +1,17 @@
+package com.hzya.frame.mdm.mdmModuleSendLog.dao.impl;
+
+import com.hzya.frame.mdm.mdmModuleSendLog.entity.MdmModuleSendLogEntity;
+import com.hzya.frame.mdm.mdmModuleSendLog.dao.IMdmModuleSendLogDao;
+import org.springframework.stereotype.Repository;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+/**
+ * 主数据模版(MdmModuleSendLog)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-06-05 16:11:09
+ */
+@Repository(value = "MdmModuleSendLogDaoImpl")
+public class MdmModuleSendLogDaoImpl extends MybatisGenericDao<MdmModuleSendLogEntity, String> implements IMdmModuleSendLogDao{
+ 
+}
+

service/src/main/java/com/hzya/frame/mdm/mdmModuleSendLog/entity/MdmModuleSendLogEntity.java

@@ -0,0 +1,94 @@
+package com.hzya.frame.mdm.mdmModuleSendLog.entity;
+
+import java.util.Date;
+import com.hzya.frame.web.entity.BaseEntity;
+/**
+ * 主数据模版(MdmModuleSendLog)实体类
+ *
+ * @author makejava
+ * @since 2024-06-05 16:11:10
+ */
+public class MdmModuleSendLogEntity extends BaseEntity {
+    //主数据表名
+    private String tableName;
+    //主数据编码
+    private Long mdmCode;
+  /**  主表id */
+   private String formmainId;
+  /**  目标应用 */
+   private String targetApp;
+  /**  目标api */
+   private String targetApi;
+  /**  源数据 */
+   private String sourceData;
+  /**  操作类型 */
+   private String optionType;
+  /**  公司id */
+   private String companyId;
+
+
+    public String getFormmainId() {
+        return formmainId;
+    }
+
+    public void setFormmainId(String formmainId) {
+        this.formmainId = formmainId;
+    }
+
+    public String getTargetApp() {
+        return targetApp;
+    }
+
+    public void setTargetApp(String targetApp) {
+        this.targetApp = targetApp;
+    }
+
+    public String getTargetApi() {
+        return targetApi;
+    }
+
+    public void setTargetApi(String targetApi) {
+        this.targetApi = targetApi;
+    }
+
+    public String getSourceData() {
+        return sourceData;
+    }
+
+    public void setSourceData(String sourceData) {
+        this.sourceData = sourceData;
+    }
+
+    public String getOptionType() {
+        return optionType;
+    }
+
+    public void setOptionType(String optionType) {
+        this.optionType = optionType;
+    }
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
+    public Long getMdmCode() {
+        return mdmCode;
+    }
+
+    public void setMdmCode(Long mdmCode) {
+        this.mdmCode = mdmCode;
+    }
+}
+

service/src/main/java/com/hzya/frame/mdm/mdmModuleSendLog/entity/MdmModuleSendLogEntity.xml

@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hzya.frame.mdm.mdmModuleSendLog.dao.impl.MdmModuleSendLogDaoImpl">
+
+    <resultMap id="get-MdmModuleSendLogEntity-result" type="com.hzya.frame.mdm.mdmModuleSendLog.entity.MdmModuleSendLogEntity" >
+       <result property="id" column="id" jdbcType="VARCHAR"/>
+           <result property="formmainId" column="formmain_id" jdbcType="VARCHAR"/>
+           <result property="targetApp" column="target_app" jdbcType="VARCHAR"/>
+           <result property="targetApi" column="target_api" jdbcType="VARCHAR"/>
+           <result property="sourceData" column="source_data" jdbcType="VARCHAR"/>
+           <result property="optionType" column="option_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 = "MdmModuleSendLogEntity_Base_Column_List">
+        id
+       ,formmain_id 
+        ,target_app 
+        ,target_api 
+        ,source_data 
+        ,option_type 
+        ,sorts 
+        ,create_user_id 
+        ,create_time 
+        ,modify_user_id 
+        ,modify_time 
+        ,sts 
+        ,org_id 
+        ,company_id 
+     </sql>
+    <!--通过ID获取数据 -->
+    <select id="entity_get" resultMap="get-MdmModuleSendLogEntity-result">
+        select
+        <include refid="MdmModuleSendLogEntity_Base_Column_List" />
+        from ${tableName} where id = #{ id } and sts='Y'
+    </select>
+ <!-- 查询 采用==查询 -->
+ <select id="entity_list_base" resultMap="get-MdmModuleSendLogEntity-result" parameterType = "com.hzya.frame.mdm.mdmModuleSendLog.entity.MdmModuleSendLogEntity">
+    select
+    <include refid="MdmModuleSendLogEntity_Base_Column_List" />
+    from ${tableName}
+    <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id = #{id} </if>
+            <if test="formmainId != null and formmainId != ''"> and formmain_id = #{formmainId} </if>
+            <if test="targetApp != null and targetApp != ''"> and target_app = #{targetApp} </if>
+            <if test="targetApi != null and targetApi != ''"> and target_api = #{targetApi} </if>
+            <if test="sourceData != null and sourceData != ''"> and source_data = #{sourceData} </if>
+            <if test="optionType != null and optionType != ''"> and option_type = #{optionType} </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.mdmModuleSendLog.entity.MdmModuleSendLogEntity">
+        select  count(1)   from ${tableName}
+    <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id = #{id} </if>
+            <if test="formmainId != null and formmainId != ''"> and formmain_id = #{formmainId} </if>
+            <if test="targetApp != null and targetApp != ''"> and target_app = #{targetApp} </if>
+            <if test="targetApi != null and targetApi != ''"> and target_api = #{targetApi} </if>
+            <if test="sourceData != null and sourceData != ''"> and source_data = #{sourceData} </if>
+            <if test="optionType != null and optionType != ''"> and option_type = #{optionType} </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>
+
+    <!-- 分页查询列表 采用like格式 -->
+<select id="entity_list_like" resultMap="get-MdmModuleSendLogEntity-result" parameterType = "com.hzya.frame.mdm.mdmModuleSendLog.entity.MdmModuleSendLogEntity">
+    select
+    <include refid="MdmModuleSendLogEntity_Base_Column_List" />
+    from ${tableName}
+    <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id like concat('%',#{id},'%') </if>
+            <if test="formmainId != null and formmainId != ''"> and formmain_id like concat('%',#{formmainId},'%') </if>
+            <if test="targetApp != null and targetApp != ''"> and target_app like concat('%',#{targetApp},'%') </if>
+            <if test="targetApi != null and targetApi != ''"> and target_api like concat('%',#{targetApi},'%') </if>
+            <if test="sourceData != null and sourceData != ''"> and source_data like concat('%',#{sourceData},'%') </if>
+            <if test="optionType != null and optionType != ''"> and option_type like concat('%',#{optionType},'%') </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>
+
+<!-- 查询列表 字段采用or格式 -->
+<select id="MdmModuleSendLogentity_list_or" resultMap="get-MdmModuleSendLogEntity-result" parameterType = "com.hzya.frame.mdm.mdmModuleSendLog.entity.MdmModuleSendLogEntity">
+    select
+    <include refid="MdmModuleSendLogEntity_Base_Column_List" />
+    from ${tableName}
+    <trim prefix="where" prefixOverrides="and"> 
+         <if test="id != null and id != ''"> or id = #{id} </if>
+             <if test="formmainId != null and formmainId != ''"> or formmain_id = #{formmainId} </if>
+             <if test="targetApp != null and targetApp != ''"> or target_app = #{targetApp} </if>
+             <if test="targetApi != null and targetApi != ''"> or target_api = #{targetApi} </if>
+             <if test="sourceData != null and sourceData != ''"> or source_data = #{sourceData} </if>
+             <if test="optionType != null and optionType != ''"> or option_type = #{optionType} </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>
+
+<!--新增所有列-->
+<insert id="entity_insert" parameterType = "com.hzya.frame.mdm.mdmModuleSendLog.entity.MdmModuleSendLogEntity" >
+    insert into ${tableName}(
+  <trim suffix="" suffixOverrides=",">
+       <if test="id != null and id != ''"> id , </if>
+            <if test="formmainId != null and formmainId != ''"> formmain_id , </if>
+            <if test="targetApp != null and targetApp != ''"> target_app , </if>
+            <if test="targetApi != null and targetApi != ''"> target_api , </if>
+            <if test="sourceData != null and sourceData != ''"> source_data , </if>
+            <if test="optionType != null and optionType != ''"> option_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="sorts == null ">sorts,</if>
+    <if test="sts == null ">sts,</if>
+  </trim>
+  )values(
+ <trim suffix="" suffixOverrides=",">
+       <if test="id != null and id != ''"> #{id} ,</if>
+            <if test="formmainId != null and formmainId != ''"> #{formmainId} ,</if>
+            <if test="targetApp != null and targetApp != ''"> #{targetApp} ,</if>
+            <if test="targetApi != null and targetApi != ''"> #{targetApi} ,</if>
+            <if test="sourceData != null and sourceData != ''"> #{sourceData} ,</if>
+            <if test="optionType != null and optionType != ''"> #{optionType} ,</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="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from ${tableName} a WHERE a.sts = 'Y' ),</if>
+    <if test="sts == null ">'Y',</if>
+  </trim>
+  )  
+</insert>
+<!-- 批量新增 -->
+<insert id="entityInsertBatch" >
+  insert into ${tableName}(formmain_id, target_app, target_api, source_data, option_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.formmainId},#{entity.targetApp},#{entity.targetApi},#{entity.sourceData},#{entity.optionType},#{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 ${tableName}(formmain_id, target_app, target_api, source_data, option_type, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id)
+    values
+    <foreach collection="entities" item="entity" separator=",">
+    (#{entity.formmainId},#{entity.targetApp},#{entity.targetApi},#{entity.sourceData},#{entity.optionType},#{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
+    formmain_id = values(formmain_id),
+    target_app = values(target_app),
+    target_api = values(target_api),
+    source_data = values(source_data),
+    option_type = values(option_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.mdmModuleSendLog.entity.MdmModuleSendLogEntity" >
+update ${tableName}  set
+<trim suffix="" suffixOverrides=",">
+  <if test="formmainId != null and formmainId != ''"> formmain_id = #{formmainId},</if>
+  <if test="targetApp != null and targetApp != ''"> target_app = #{targetApp},</if>
+  <if test="targetApi != null and targetApi != ''"> target_api = #{targetApi},</if>
+  <if test="sourceData != null and sourceData != ''"> source_data = #{sourceData},</if>
+  <if test="optionType != null and optionType != ''"> option_type = #{optionType},</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.mdmModuleSendLog.entity.MdmModuleSendLogEntity" >
+update ${tableName}  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.mdmModuleSendLog.entity.MdmModuleSendLogEntity" >
+update ${tableName}  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="formmainId != null and formmainId != ''"> and formmain_id = #{formmainId} </if>
+            <if test="targetApp != null and targetApp != ''"> and target_app = #{targetApp} </if>
+            <if test="targetApi != null and targetApi != ''"> and target_api = #{targetApi} </if>
+            <if test="sourceData != null and sourceData != ''"> and source_data = #{sourceData} </if>
+            <if test="optionType != null and optionType != ''"> and option_type = #{optionType} </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 ${tableName} where id = #{id}
+</delete>
+
+</mapper>
+

service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/dao/IMdmModuleSourceDao.java

@@ -0,0 +1,27 @@
+package com.hzya.frame.mdm.mdmModuleSource.dao;
+
+import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity;
+import com.hzya.frame.basedao.dao.IBaseDao;
+
+import java.util.List;
+
+/**
+ * 主数据数据来源(mdm_module_source: table)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-06-05 11:42:56
+ */
+public interface IMdmModuleSourceDao extends IBaseDao<MdmModuleSourceEntity, String> {
+    
+    /**
+     * 
+     * @content 根据数据来源内类型是插件的应用类型做分组
+     * @Param 
+     * @Return 
+     * @Author hecan 
+     * @Date 2024/6/6 10:43
+     * **/
+    List<MdmModuleSourceEntity> MdmModuleSourceentityGroupByType();
+
+}
+

service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/dao/impl/MdmModuleSourceDaoImpl.java

@@ -0,0 +1,28 @@
+package com.hzya.frame.mdm.mdmModuleSource.dao.impl;
+
+import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity;
+import com.hzya.frame.mdm.mdmModuleSource.dao.IMdmModuleSourceDao;
+import org.springframework.stereotype.Repository;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+
+import java.util.List;
+
+/**
+ * 主数据数据来源(MdmModuleSource)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-06-05 11:42:56
+ */
+@Repository(value = "MdmModuleSourceDaoImpl")
+public class MdmModuleSourceDaoImpl extends MybatisGenericDao<MdmModuleSourceEntity, String> implements IMdmModuleSourceDao{
+    //根据数据来源内类型是插件的应用类型做分组
+    @Override
+    public List<MdmModuleSourceEntity> MdmModuleSourceentityGroupByType() {
+        List<MdmModuleSourceEntity> list =(List<MdmModuleSourceEntity>) super.selectList(getSqlIdPrifx() + "MdmModuleSourceentityGroupByType", "");
+        return list;
+    }
+
+
+
+}
+

service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.java

@@ -0,0 +1,74 @@
+package com.hzya.frame.mdm.mdmModuleSource.entity;
+
+import java.util.Date;
+import com.hzya.frame.web.entity.BaseEntity;
+/**
+ * 主数据数据来源(MdmModuleSource)实体类
+ *
+ * @author makejava
+ * @since 2024-06-05 11:42:57
+ */
+public class MdmModuleSourceEntity extends BaseEntity {
+ 
+  /**  主数据模版ID */
+   private String mdmId;
+  /**  来源类型 */
+   private String sourceType;
+  /**  来源名称 */
+   private String sourceName;
+  /**  来源编码 */
+   private String sourceCode;
+  /**  公司id */
+   private String companyId;
+   private String pluginCode;//插件编码
+
+    public String getPluginCode() {
+        return pluginCode;
+    }
+
+    public void setPluginCode(String pluginCode) {
+        this.pluginCode = pluginCode;
+    }
+
+    public String getMdmId() {
+        return mdmId;
+    }
+
+    public void setMdmId(String mdmId) {
+        this.mdmId = mdmId;
+    }
+
+    public String getSourceType() {
+        return sourceType;
+    }
+
+    public void setSourceType(String sourceType) {
+        this.sourceType = sourceType;
+    }
+
+    public String getSourceName() {
+        return sourceName;
+    }
+
+    public void setSourceName(String sourceName) {
+        this.sourceName = sourceName;
+    }
+
+    public String getSourceCode() {
+        return sourceCode;
+    }
+
+    public void setSourceCode(String sourceCode) {
+        this.sourceCode = sourceCode;
+    }
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+}
+

service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml

@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hzya.frame.mdm.mdmModuleSource.dao.impl.MdmModuleSourceDaoImpl">
+
+    <resultMap id="get-MdmModuleSourceEntity-result" type="com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity" >
+       <result property="id" column="id" jdbcType="VARCHAR"/>
+           <result property="mdmId" column="mdm_id" jdbcType="VARCHAR"/>
+           <result property="sourceType" column="source_type" jdbcType="VARCHAR"/>
+           <result property="sourceName" column="source_name" jdbcType="VARCHAR"/>
+           <result property="sourceCode" column="source_code" 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 = "MdmModuleSourceEntity_Base_Column_List">
+        id
+       ,mdm_id 
+        ,source_type 
+        ,source_name 
+        ,source_code 
+        ,sorts 
+        ,create_user_id 
+        ,create_time 
+        ,modify_user_id 
+        ,modify_time 
+        ,sts 
+        ,org_id 
+        ,company_id 
+     </sql>
+ <!-- 查询 采用==查询 -->
+ <select id="entity_list_base" resultMap="get-MdmModuleSourceEntity-result" parameterType = "com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity">
+    select
+    <include refid="MdmModuleSourceEntity_Base_Column_List" />
+    from mdm_module_source
+    <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="sourceType != null and sourceType != ''"> and source_type = #{sourceType} </if>
+            <if test="sourceName != null and sourceName != ''"> and source_name = #{sourceName} </if>
+            <if test="sourceCode != null and sourceCode != ''"> and source_code = #{sourceCode} </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.mdmModuleSource.entity.MdmModuleSourceEntity">
+        select  count(1)   from mdm_module_source
+    <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="sourceType != null and sourceType != ''"> and source_type = #{sourceType} </if>
+            <if test="sourceName != null and sourceName != ''"> and source_name = #{sourceName} </if>
+            <if test="sourceCode != null and sourceCode != ''"> and source_code = #{sourceCode} </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>
+
+    <!-- 分页查询列表 采用like格式 -->
+<select id="entity_list_like" resultMap="get-MdmModuleSourceEntity-result" parameterType = "com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity">
+    select
+    <include refid="MdmModuleSourceEntity_Base_Column_List" />
+    from mdm_module_source
+    <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="sourceType != null and sourceType != ''"> and source_type like concat('%',#{sourceType},'%') </if>
+            <if test="sourceName != null and sourceName != ''"> and source_name like concat('%',#{sourceName},'%') </if>
+            <if test="sourceCode != null and sourceCode != ''"> and source_code like concat('%',#{sourceCode},'%') </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>
+
+<!-- 查询列表 字段采用or格式 -->
+<select id="MdmModuleSourceentity_list_or" resultMap="get-MdmModuleSourceEntity-result" parameterType = "com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity">
+    select
+    <include refid="MdmModuleSourceEntity_Base_Column_List" />
+    from mdm_module_source
+    <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="sourceType != null and sourceType != ''"> or source_type = #{sourceType} </if>
+             <if test="sourceName != null and sourceName != ''"> or source_name = #{sourceName} </if>
+             <if test="sourceCode != null and sourceCode != ''"> or source_code = #{sourceCode} </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>
+
+    <!-- 根据数据来源内类型是插件的应用类型做分组 -->
+    <select id="queryMdmModuleSourceentityGroupByType" resultMap="get-MdmModuleSourceEntity-result" parameterType = "com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity">
+        select plugin_code,plugin_name,source_name,source_code
+        from mdm_module_source source
+                 left join sys_application_plugin plug on plug.id=source.source_code
+        where source_type='1' and source.sts='Y' and plug.sts='Y'
+    </select>
+
+<!--新增所有列-->
+<insert id="entity_insert" parameterType = "com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity" >
+    insert into mdm_module_source(
+  <trim suffix="" suffixOverrides=",">
+       <if test="id != null and id != ''"> id , </if>
+            <if test="mdmId != null and mdmId != ''"> mdm_id , </if>
+            <if test="sourceType != null and sourceType != ''"> source_type , </if>
+            <if test="sourceName != null and sourceName != ''"> source_name , </if>
+            <if test="sourceCode != null and sourceCode != ''"> source_code , </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="sorts == null ">sorts,</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="sourceType != null and sourceType != ''"> #{sourceType} ,</if>
+            <if test="sourceName != null and sourceName != ''"> #{sourceName} ,</if>
+            <if test="sourceCode != null and sourceCode != ''"> #{sourceCode} ,</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="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_module_source a WHERE a.sts = 'Y' ),</if>
+    <if test="sts == null ">'Y',</if>
+  </trim>
+  )  
+</insert>
+<!-- 批量新增 -->
+<insert id="entityInsertBatch" >
+  insert into mdm_module_source(mdm_id, source_type, source_name, source_code, 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.sourceType},#{entity.sourceName},#{entity.sourceCode},#{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_source(mdm_id, source_type, source_name, source_code, 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.sourceType},#{entity.sourceName},#{entity.sourceCode},#{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),
+    source_type = values(source_type),
+    source_name = values(source_name),
+    source_code = values(source_code),
+    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.mdmModuleSource.entity.MdmModuleSourceEntity" >
+update mdm_module_source  set
+<trim suffix="" suffixOverrides=",">
+  <if test="mdmId != null and mdmId != ''"> mdm_id = #{mdmId},</if>
+  <if test="sourceType != null and sourceType != ''"> source_type = #{sourceType},</if>
+  <if test="sourceName != null and sourceName != ''"> source_name = #{sourceName},</if>
+  <if test="sourceCode != null and sourceCode != ''"> source_code = #{sourceCode},</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.mdmModuleSource.entity.MdmModuleSourceEntity" >
+update mdm_module_source  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.mdmModuleSource.entity.MdmModuleSourceEntity" >
+update mdm_module_source  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="sourceType != null and sourceType != ''"> and source_type = #{sourceType} </if>
+            <if test="sourceName != null and sourceName != ''"> and source_name = #{sourceName} </if>
+            <if test="sourceCode != null and sourceCode != ''"> and source_code = #{sourceCode} </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_source where id = #{id}
+</delete>
+
+</mapper>
+

service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/service/IMdmModuleSourceService.java

@@ -0,0 +1,12 @@
+package com.hzya.frame.mdm.mdmModuleSource.service;
+
+import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity;
+import com.hzya.frame.basedao.service.IBaseService;
+/**
+ * 主数据数据来源(MdmModuleSource)表服务接口
+ *
+ * @author makejava
+ * @since 2024-06-05 11:42:57
+ */
+public interface IMdmModuleSourceService extends IBaseService<MdmModuleSourceEntity, String>{
+}

service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/service/impl/MdmModuleSourceServiceImpl.java

@@ -0,0 +1,26 @@
+package com.hzya.frame.mdm.mdmModuleSource.service.impl;
+
+import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity;
+import com.hzya.frame.mdm.mdmModuleSource.dao.IMdmModuleSourceDao;
+import com.hzya.frame.mdm.mdmModuleSource.service.IMdmModuleSourceService;
+import org.springframework.stereotype.Service; 
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
+import com.hzya.frame.basedao.service.impl.BaseService;
+/**
+ * 主数据数据来源(MdmModuleSource)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-06-05 11:42:57
+ */
+@Service(value = "mdmModuleSourceService")
+public class MdmModuleSourceServiceImpl extends BaseService<MdmModuleSourceEntity, String> implements IMdmModuleSourceService {
+     
+    private IMdmModuleSourceDao mdmModuleSourceDao;
+    
+    @Autowired
+	public void setMdmModuleSourceDao(IMdmModuleSourceDao dao) {
+		this.mdmModuleSourceDao = dao;
+		this.dao = dao;
+	}
+}