From 67ab11cddc3a767d2670a4529c04ecea1d079471 Mon Sep 17 00:00:00 2001
From: zhengyf <zyf654042662@163.com>
Date: Wed, 25 Jun 2025 10:39:39 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=8D=95=E6=8D=AE=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=97=B6=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=B5=8C?=
 =?UTF-8?q?=E5=A5=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mdm/mdmModule/entity/MdmModuleEntity.java | 28 +++++++++++++++++++
 .../mdm/mdmModule/entity/MdmModuleEntity.xml  | 21 ++++++++++++++
 .../entity/MdmModuleDbFiledsEntity.java       | 14 ++++++++++
 3 files changed, 63 insertions(+)

diff --git a/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.java b/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.java
index 94d2b5e7..730e9eb3 100644
--- a/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.java
+++ b/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.java
@@ -28,6 +28,10 @@ public class MdmModuleEntity extends BaseEntity {
     private String modifyUser;
     /** 0：预制 1：手工 */
     private String tag;
+    private String u8cDbPk;
+    private String nccDbPk;
+    private String ysDbPk;
+
 
     public String getTag() {
         return tag;
@@ -37,6 +41,30 @@ public class MdmModuleEntity extends BaseEntity {
         this.tag = tag;
     }
 
+    public String getU8cDbPk() {
+        return u8cDbPk;
+    }
+
+    public void setU8cDbPk(String u8cDbPk) {
+        this.u8cDbPk = u8cDbPk;
+    }
+
+    public String getNccDbPk() {
+        return nccDbPk;
+    }
+
+    public void setNccDbPk(String nccDbPk) {
+        this.nccDbPk = nccDbPk;
+    }
+
+    public String getYsDbPk() {
+        return ysDbPk;
+    }
+
+    public void setYsDbPk(String ysDbPk) {
+        this.ysDbPk = ysDbPk;
+    }
+
     public String getMdmName() {
         return mdmName;
     }
diff --git a/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml b/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml
index 07618be5..d9e0129a 100644
--- a/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml
+++ b/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml
@@ -20,6 +20,9 @@
         <result property="org_id" column="org_id" jdbcType="VARCHAR"/>
         <result property="companyId" column="company_id" jdbcType="VARCHAR"/>
         <result property="tag" column="tag" jdbcType="VARCHAR"/>
+        <result property="u8cDbPk" column="u8c_db_pk" jdbcType="VARCHAR"/>
+        <result property="nccDbPk" column="ncc_db_pk" jdbcType="VARCHAR"/>
+        <result property="ysDbPk" column="ys_db_pk" jdbcType="VARCHAR"/>
     </resultMap>
 
 
@@ -41,6 +44,9 @@
         ,org_id
         ,company_id
         ,tag
+        ,u8c_db_pk
+        ,ncc_db_pk
+        ,ys_db_pk
      </sql>
     <!--通过ID获取数据 -->
     <select id="entity_get" resultMap="get-MdmModuleEntity-result">
@@ -70,6 +76,9 @@
             <if test="org_id != null and org_id != ''">and org_id = #{org_id}</if>
             <if test="companyId != null and companyId != ''">and company_id = #{companyId}</if>
             <if test="tag != null and tag != ''">and tag = #{tag}</if>
+            <if test="u8cDbPk != null and u8cDbPk != ''">and u8c_db_pk = #{u8cDbPk}</if>
+            <if test="nccDbPk != null and nccDbPk != ''">and ncc_db_pk = #{nccDbPk}</if>
+            <if test="ysDbPk != null and ysDbPk != ''">and ys_db_pk = #{ysDbPk}</if>
             and sts='Y'
         </trim>
         <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
@@ -95,6 +104,9 @@
             <if test="org_id != null and org_id != ''">and org_id = #{org_id}</if>
             <if test="companyId != null and companyId != ''">and company_id = #{companyId}</if>
             <if test="tag != null and tag != ''">and tag = #{tag}</if>
+            <if test="u8cDbPk != null and u8cDbPk != ''">and u8c_db_pk = #{u8cDbPk}</if>
+            <if test="nccDbPk != null and nccDbPk != ''">and ncc_db_pk = #{nccDbPk}</if>
+            <if test="ysDbPk != null and ysDbPk != ''">and ys_db_pk = #{ysDbPk}</if>
             and sts='Y'
         </trim>
         <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
@@ -182,6 +194,9 @@
             <if test="companyId != null and companyId != ''">company_id ,</if>
             <if test="sts == null ">sts,</if>
             <if test="tag == null ">tag ,</if>
+            <if test="u8cDbPk != null and u8cDbPk != ''">u8c_db_pk,</if>
+            <if test="nccDbPk != null and nccDbPk != ''">ncc_db_pk,</if>
+            <if test="ysDbPk != null and ysDbPk != ''">ys_db_pk,</if>
         </trim>
         )values(
         <trim suffix="" suffixOverrides=",">
@@ -202,6 +217,9 @@
             <if test="companyId != null and companyId != ''">#{companyId} ,</if>
             <if test="sts == null ">'Y',</if>
             <if test="tag == null ">'1',</if>
+            <if test="u8cDbPk != null and u8cDbPk != ''">#{u8cDbPk},</if>
+            <if test="nccDbPk != null and nccDbPk != ''">#{nccDbPk},</if>
+            <if test="ysDbPk != null and ysDbPk != ''">#{ysDbPk},</if>
         </trim>
         )
     </insert>
@@ -289,6 +307,9 @@ where id = #{id}
     <select id="queryMdm" resultMap="get-MdmModuleEntity-result"
             parameterType="com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity">
         select
+        a.u8c_db_pk as u8c_db_pk,
+        a.ncc_db_pk as ncc_db_pk,
+        a.ys_db_pk as ys_db_pk,
         a.id as id,
         a.mdm_name as mdm_name,
         a.mdm_logo as mdm_logo,
diff --git a/base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java b/base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java
index d1f1cf45..aa027d09 100644
--- a/base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java
+++ b/base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java
@@ -2,6 +2,7 @@ package com.hzya.frame.mdm.mdmModuleDbFileds.entity;
 
 import java.util.List;
 
+import com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity;
 import com.hzya.frame.mdm.mdmModuleDbFiledsRule.entity.MdmModuleDbFiledsRuleEntity;
 import com.hzya.frame.web.entity.BaseEntity;
 
@@ -253,5 +254,18 @@ public class MdmModuleDbFiledsEntity extends BaseEntity {
     public void setIsSysName(String isSysName) {
         this.isSysName = isSysName;
     }
+
+    /**
+     * 关联的表
+     */
+    private MdmModuleDbEntity mdmModuleDbEntity;
+
+    public MdmModuleDbEntity getMdmModuleDbEntity() {
+        return mdmModuleDbEntity;
+    }
+
+    public void setMdmModuleDbEntity(MdmModuleDbEntity mdmModuleDbEntity) {
+        this.mdmModuleDbEntity = mdmModuleDbEntity;
+    }
 }