From b9e95da6a4827e6b5fa5ade5d6ecdb3954bed580 Mon Sep 17 00:00:00 2001
From: zhengyf <zyf654042662@163.com>
Date: Fri, 11 Jul 2025 16:57:45 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=B8=BB=E6=95=B0=E6=8D=AE=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=96=B0=E5=A2=9E=E6=98=AF=E5=90=A6=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MdmModuleServiceImpl.java         | 14 ++++++++++++++
 .../entity/MdmModuleDbFiledsEntity.java            | 12 ++++++++++++
 .../entity/MdmModuleDbFiledsEntity.xml             | 10 ++++++++++
 3 files changed, 36 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 f8e00846..5ac744bd 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
@@ -1432,6 +1432,7 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
         boolean isSysPk = false;
         boolean isSysCode = false;
         boolean isSysName = false;
+        boolean isSysDate = false;
         for (MdmModuleDbFiledsEntity dbFiledsEntity : mdmModuleDbFiledsEntityList) {
             if (entity.getDbId().equals(dbFiledsEntity.getDbId())) {
                 if (entity.getDbId().equals(dbFiledsEntity.getDbId())) {
@@ -1444,6 +1445,9 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
                     if ("Y".equals(dbFiledsEntity.getIsSysName())) {
                         isSysName = true;
                     }
+                    if ("Y".equals(dbFiledsEntity.getIsSysDate())) {
+                        isSysDate = true;
+                    }
                 }
             }
         }
@@ -1457,6 +1461,9 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
         if ("Y".equals(entity.getIsSysName()) && isSysName) {
             return BaseResult.getFailureMessageEntity("系统name字段已存在，请修改");
         }
+        if ("Y".equals(entity.getIsSysDate()) && isSysDate) {
+            return BaseResult.getFailureMessageEntity("系统date字段已存在，请修改");
+        }
         entity.setCreate();
         if ("1".equals(entity.getDbType())) {
             entity.setAddType("1");
@@ -1544,6 +1551,7 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
         boolean isSysPk = false;
         boolean isSysCode = false;
         boolean isSysName = false;
+        boolean isSysDate = false;
         for (MdmModuleDbFiledsEntity dbFiledsEntity : mdmModuleDbFiledsEntityList) {
             if (entity.getDbId().equals(dbFiledsEntity.getDbId())) {
                 if (entity.getDbId().equals(dbFiledsEntity.getDbId())) {
@@ -1556,6 +1564,9 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
                     if ("Y".equals(dbFiledsEntity.getIsSysName())) {
                         isSysName = true;
                     }
+                    if ("Y".equals(dbFiledsEntity.getIsSysDate())) {
+                        isSysDate = true;
+                    }
                 }
             }
         }
@@ -1569,6 +1580,9 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
         if ("Y".equals(entity.getIsSysName()) && isSysName) {
             return BaseResult.getFailureMessageEntity("系统name字段已存在，请修改");
         }
+        if ("Y".equals(entity.getIsSysDate()) && isSysDate) {
+            return BaseResult.getFailureMessageEntity("系统date字段已存在，请修改");
+        }
 
         List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntities = new ArrayList<>();
         mdmModuleDbFiledsEntities.add(entity);
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 697cbeef..94a0d196 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
@@ -230,6 +230,10 @@ public class MdmModuleDbFiledsEntity extends BaseEntity {
      * 是否sys名称 系统name（三方系统name，同步中台之后，该字段作为name）Y/N
      */
     private String isSysName;
+    /**
+     * 是否sys名称 系统date（三方系统name，同步中台之后，该字段作为name）Y/N
+     */
+    private String isSysDate;
 
     public String getIsSysPk() {
         return isSysPk;
@@ -255,6 +259,14 @@ public class MdmModuleDbFiledsEntity extends BaseEntity {
         this.isSysName = isSysName;
     }
 
+    public String getIsSysDate() {
+        return isSysDate;
+    }
+
+    public void setIsSysDate(String isSysDate) {
+        this.isSysDate = isSysDate;
+    }
+
     /**
      * 关联的表
      */
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 7f9c3f1f..db3512d6 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
@@ -28,6 +28,7 @@
         <result property="isSysPk" column="sys_pk" jdbcType="VARCHAR"/>
         <result property="isSysCode" column="sys_code" jdbcType="VARCHAR"/>
         <result property="isSysName" column="sys_name" jdbcType="VARCHAR"/>
+        <result property="isSysDate" column="sys_date" jdbcType="VARCHAR"/>
     </resultMap>
     <!-- 查询的字段-->
     <sql id="MdmModuleDbFiledsEntity_Base_Column_List">
@@ -55,6 +56,7 @@
         ,sys_pk
         ,sys_code
         ,sys_name
+        ,sys_date
     </sql>
     <!-- 查询 采用==查询 -->
     <select id="entity_list_base" resultMap="get-MdmModuleDbFiledsEntity-result"
@@ -87,6 +89,7 @@
             <if test="isSysPk != null and isSysPk != ''">and sys_pk = #{isSysPk}</if>
             <if test="isSysCode != null and isSysCode != ''">and sys_code = #{isSysCode}</if>
             <if test="isSysName != null and isSysName != ''">and sys_name = #{isSysName}</if>
+            <if test="isSysDate != null and isSysDate != ''">and sys_date = #{isSysDate}</if>
             <if test="roletype != null and roletype != ''">
                 and id in (
                 select
@@ -130,6 +133,7 @@
             <if test="isSysPk != null and isSysPk != ''">and sys_pk = #{isSysPk}</if>
             <if test="isSysCode != null and isSysCode != ''">and sys_code = #{isSysCode}</if>
             <if test="isSysName != null and isSysName != ''">and sys_name = #{isSysName}</if>
+            <if test="isSysDate != null and isSysDate != ''">and sys_date = #{isSysDate}</if>
             and sts='Y'
         </trim>
         <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
@@ -173,6 +177,7 @@
             <if test="isSysPk != null and isSysPk != ''">and sys_pk like concat('%',#{isSysPk},'%')</if>
             <if test="isSysCode != null and isSysCode != ''">and sys_code like concat('%',#{isSysCode},'%')</if>
             <if test="isSysName != null and isSysName != ''">and sys_name like concat('%',#{isSysName},'%')</if>
+            <if test="isSysDate != null and isSysDate != ''">and sys_date like concat('%',#{isSysDate},'%')</if>
             and sts='Y'
         </trim>
         <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
@@ -211,6 +216,7 @@
             <if test="isSysPk != null and isSysPk != ''">or sys_pk = #{isSysPk}</if>
             <if test="isSysCode != null and isSysCode != ''">or sys_code = #{isSysCode}</if>
             <if test="isSysName != null and isSysName != ''">or sys_name = #{isSysName}</if>
+            <if test="isSysDate != null and isSysDate != ''">or sys_date = #{isSysDate}</if>
 
             and sts='Y'
         </trim>
@@ -246,6 +252,7 @@
             <if test="isSysPk != null and isSysPk != ''">sys_pk ,</if>
             <if test="isSysCode != null and isSysCode != ''">sys_code ,</if>
             <if test="isSysName != null and isSysName != ''">sys_name ,</if>
+            <if test="isSysDate != null and isSysDate != ''">sys_date ,</if>
             <if test="sts == null ">sts,</if>
         </trim>
         )values(
@@ -274,6 +281,7 @@
             <if test="isSysPk != null and isSysPk != ''">#{isSysPk} ,</if>
             <if test="isSysCode != null and isSysCode != ''">#{isSysCode} ,</if>
             <if test="isSysName != null and isSysName != ''">#{isSysName} ,</if>
+            <if test="isSysDate != null and isSysDate != ''">#{isSysDate} ,</if>
             <if test="sts == null ">'Y',</if>
         </trim>
         )
@@ -348,6 +356,8 @@
             <if test="isSysCode == null ">sys_code = null,</if>
             <if test="isSysName != null and isSysName != ''">sys_name = #{isSysName},</if>
             <if test="isSysName == null ">sys_name = null,</if>
+            <if test="isSysDate != null and isSysDate != ''">sys_date = #{isSysDate},</if>
+            <if test="isSysDate == null ">sys_date = null,</if>
         </trim>
         where id = #{id}
     </update>