From 8f20dc76688ac2890811fed100c1f3b4d951f264 Mon Sep 17 00:00:00 2001
From: zhengyf <zyf654042662@163.com>
Date: Tue, 10 Jun 2025 08:47:41 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=A7=91=E7=9B=AE=E5=AF=B9=E7=85=A7?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=A5=E5=85=85=E5=AD=97=E6=AE=B5=EF=BC=9A?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=B8=BB=E9=94=AE=E3=80=81=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E7=BC=96=E7=A0=81=E3=80=81=E7=B3=BB=E7=BB=9F=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MdmModuleServiceImpl.java    | 20 ++++++++++
 .../entity/MdmModuleDbFiledsEntity.java       | 37 +++++++++++++++++++
 .../entity/MdmModuleDbFiledsEntity.xml        | 27 ++++++++++++++
 3 files changed, 84 insertions(+)

diff --git a/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java b/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java
index c32080d1..8ec63458 100644
--- a/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java
+++ b/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java
@@ -1411,6 +1411,26 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
                 }
             }
         }
+        //查询sysPk,sysCode,sysName段是否存在 add by zyd 2025-06-09
+//        boolean isSysPk = false;
+//        boolean isSysCode = false;
+//        boolean isSysName = false;
+        for (MdmModuleDbFiledsEntity dbFiledsEntity : mdmModuleDbFiledsEntityList) {
+            if ("Y".equals(dbFiledsEntity.getSysPk())) {
+//                isSysPk = true;
+                return BaseResult.getFailureMessageEntity("系统主键字段已存在，请修改");
+            }
+            if ("Y".equals(dbFiledsEntity.getSysCode())) {
+//                isSysCode = true;
+                return BaseResult.getFailureMessageEntity("系统code字段已存在，请修改");
+            }
+            if ("Y".equals(dbFiledsEntity.getSysName())) {
+//                isSysName = true;
+                return BaseResult.getFailureMessageEntity("系统name字段已存在，请修改");
+            }
+        }
+
+
         entity.setCreate();
         if ("1".equals(entity.getDbType())) {
             entity.setAddType("1");
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 3e1debd5..79092656 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
@@ -216,5 +216,42 @@ public class MdmModuleDbFiledsEntity extends BaseEntity {
     public void setDbType(String dbType) {
         this.dbType = dbType;
     }
+
+    /**
+     * 是否sys主键 系统主键（三方系统主键，同步中台之后，该字段作为主键）Y/N
+     */
+    private String sysPk;
+    /**
+     * 是否sys编码 系统code（三方系统code，同步中台之后，该字段作为code）Y/N
+     */
+    private String sysCode;
+    /**
+     * 是否sys名称 系统name（三方系统name，同步中台之后，该字段作为name）Y/N
+     */
+    private String sysName;
+
+    public String getSysPk() {
+        return sysPk;
+    }
+
+    public void setSysPk(String sysPk) {
+        this.sysPk = sysPk;
+    }
+
+    public String getSysCode() {
+        return sysCode;
+    }
+
+    public void setSysCode(String sysCode) {
+        this.sysCode = sysCode;
+    }
+
+    public String getSysName() {
+        return sysName;
+    }
+
+    public void setSysName(String sysName) {
+        this.sysName = sysName;
+    }
 }
 
diff --git a/base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.xml b/base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.xml
index 0bb6e1c3..7225c4b7 100644
--- a/base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.xml
+++ b/base-service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.xml
@@ -24,6 +24,9 @@
            <result property="sts" column="sts" jdbcType="VARCHAR"/>
            <result property="org_id" column="org_id" jdbcType="VARCHAR"/>
            <result property="companyId" column="company_id" jdbcType="VARCHAR"/>
+           <result property="sysPk" column="sys_pk" jdbcType="VARCHAR"/>
+           <result property="sysCode" column="sys_code" jdbcType="VARCHAR"/>
+           <result property="sysName" column="sys_name" jdbcType="VARCHAR"/>
         </resultMap>
     <!-- 查询的字段-->
     <sql id = "MdmModuleDbFiledsEntity_Base_Column_List">
@@ -48,6 +51,9 @@
         ,sts 
         ,org_id 
         ,company_id 
+        ,sys_pk
+        ,sys_code
+        ,sys_name
      </sql>
  <!-- 查询 采用==查询 -->
  <select id="entity_list_base" resultMap="get-MdmModuleDbFiledsEntity-result" parameterType = "com.hzya.frame.mdm.mdmModuleDbFileds.entity.MdmModuleDbFiledsEntity">
@@ -76,6 +82,9 @@
             <if test="sts != null and sts != ''"> and sts = #{sts} </if>
             <if test="org_id != null and org_id != ''"> and org_id = #{org_id} </if>
             <if test="companyId != null and companyId != ''"> and company_id = #{companyId} </if>
+            <if test="sysPk != null and sysPk != ''"> and sys_pk = #{sysPk} </if>
+            <if test="sysCode != null and sysCode != ''"> and sys_code = #{sysCode} </if>
+            <if test="sysName != null and sysName != ''"> and sys_name = #{sysName} </if>
             <if test="roletype != null and roletype != ''">
                 and id in (
                 select
@@ -115,6 +124,9 @@
             <if test="sts != null and sts != ''"> and sts = #{sts} </if>
             <if test="org_id != null and org_id != ''"> and org_id = #{org_id} </if>
             <if test="companyId != null and companyId != ''"> and company_id = #{companyId} </if>
+            <if test="sysPk != null and sysPk != ''"> and sys_pk = #{sysPk} </if>
+            <if test="sysCode != null and sysCode != ''"> and sys_code = #{sysCode} </if>
+            <if test="sysName != null and sysName != ''"> and sys_name = #{sysName} </if>
             and sts='Y'
     </trim>
     <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
@@ -148,6 +160,10 @@
             <if test="sts != null and sts != ''"> and sts like concat('%',#{sts},'%') </if>
             <if test="org_id != null and org_id != ''"> and org_id like concat('%',#{org_id},'%') </if>
             <if test="companyId != null and companyId != ''"> and company_id like concat('%',#{companyId},'%') </if>
+
+            <if test="sysPk != null and sysPk != ''"> and sys_pk like concat('%',#{sysPk},'%') </if>
+            <if test="sysCode != null and sysCode != ''"> and sys_code like concat('%',#{sysCode},'%') </if>
+            <if test="sysName != null and sysName != ''"> and sys_name like concat('%',#{sysName},'%') </if>
             and sts='Y'
     </trim>
     <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
@@ -181,6 +197,11 @@
               <if test="sts != null and sts != ''"> or sts = #{sts} </if>
              <if test="org_id != null and org_id != ''"> or org_id = #{org_id} </if>
               <if test="companyId != null and companyId != ''"> or company_id = #{companyId} </if>
+
+            <if test="sysPk != null and sysPk != ''"> or sys_pk = #{sysPk} </if>
+            <if test="sysCode != null and sysCode != ''"> or sys_code = #{sysCode} </if>
+            <if test="sysName != null and sysName != ''"> or sys_name = #{sysName} </if>
+
             and sts='Y'
     </trim>
     <if test=" sort == null or sort == ''.toString()  "> order by sorts asc</if>
@@ -212,6 +233,9 @@
             <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="sysPk != null and sysPk != ''"> sys_pk , </if>
+          <if test="sysCode != null and sysCode != ''">  sys_code , </if>
+          <if test="sysName != null and sysName != ''">  sys_name , </if>
     <if test="sts == null ">sts,</if>
   </trim>
   )values(
@@ -237,6 +261,9 @@
             <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="sysPk != null and sysPk != ''"> #{sysPk} ,</if>
+            <if test="sysCode != null and sysCode != ''"> #{sysCode} ,</if>
+            <if test="sysName != null and sysName != ''"> #{sysName} ,</if>
     <if test="sts == null ">'Y',</if>
   </trim>
   )