From 47fcc01651fffa00b41ded83adeadb544fe93004 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Sat, 14 Sep 2024 21:23:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=8C=E9=9D=A2=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=98=AF=E5=90=A6=E5=B8=B8=E7=94=A8=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E5=BA=93=E4=B8=BA?=
 =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E6=95=B0=E6=8D=AE=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auth/SysCustomConfigDetailEntity.java     |  6 ++++++
 src/main/resources/application-dev.yml        |  4 ++--
 .../mapper/auth/SysCustomConfigDetailDao.xml  | 21 ++++++++++++-------
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/glxp/api/entity/auth/SysCustomConfigDetailEntity.java b/src/main/java/com/glxp/api/entity/auth/SysCustomConfigDetailEntity.java
index 93d9887eb..9e59069f1 100644
--- a/src/main/java/com/glxp/api/entity/auth/SysCustomConfigDetailEntity.java
+++ b/src/main/java/com/glxp/api/entity/auth/SysCustomConfigDetailEntity.java
@@ -185,4 +185,10 @@ public class SysCustomConfigDetailEntity {
      */
     @TableField("isShowXx")
     private String isShowXx;
+
+    /**
+     * 是否禁用
+     */
+    @TableField("isImport")
+    private Boolean isImport;
 }
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 10d81b490..815fbe996 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -4,9 +4,9 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://dm.xmglxp.com:33066/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: 123456
+    password: Glxp@6066
     hikari:
       connection-timeout: 60000
       maximum-pool-size: 20
diff --git a/src/main/resources/mybatis/mapper/auth/SysCustomConfigDetailDao.xml b/src/main/resources/mybatis/mapper/auth/SysCustomConfigDetailDao.xml
index 9bc006e6f..bde59c29f 100644
--- a/src/main/resources/mybatis/mapper/auth/SysCustomConfigDetailDao.xml
+++ b/src/main/resources/mybatis/mapper/auth/SysCustomConfigDetailDao.xml
@@ -17,18 +17,22 @@
                 AND isShow = #{isShow}
             </if>
         </where>
-        order by lineNumber asc,number desc
+        order by lineNumber asc, number desc
     </select>
 
 
     <insert id="insertSysCustomConfigDetail" keyProperty="id"
             parameterType="com.glxp.api.entity.auth.SysCustomConfigDetailEntity">
         INSERT INTO sys_custom_config_detail
-                (id,configId,type,isShow, columnName,columnDesc,columnType,colorRule,sort,lableRule,width,tooltip,buttonRule,number,
-                 clickFuc,disabledFuc,expression,size,style,disabled,checkRules,inputType,lineNumber,dataFuc,isShowXx)
-        values (#{id},#{configId},#{type},#{isShow}, #{columnName},#{columnDesc},#{columnType},#{colorRule},#{sort},
-                #{lableRule},#{width},#{tooltip},#{buttonRule},#{number},#{clickFuc},#{disabledFuc},#{expression},#{size},#{style},
-                #{disabled}, #{checkRules}, #{inputType}, #{lineNumber}, #{dataFuc},#{isShowXx})
+        (id, configId, type, isShow, columnName, columnDesc, columnType, colorRule, sort, lableRule, width, tooltip,
+         buttonRule, number,
+         clickFuc, disabledFuc, expression, size, style, disabled, checkRules, inputType, lineNumber, dataFuc, isShowXx,
+         isImport)
+        values (#{id}, #{configId}, #{type}, #{isShow}, #{columnName}, #{columnDesc}, #{columnType}, #{colorRule},
+                #{sort},
+                #{lableRule}, #{width}, #{tooltip}, #{buttonRule}, #{number}, #{clickFuc}, #{disabledFuc},
+                #{expression}, #{size}, #{style},
+                #{disabled}, #{checkRules}, #{inputType}, #{lineNumber}, #{dataFuc}, #{isShowXx}, #{isImport})
     </insert>
 
     <update id="updateSysCustomConfigDetail" parameterType="com.glxp.api.entity.auth.SysCustomConfigDetailEntity">
@@ -106,6 +110,9 @@
             <if test="isShowXx != null">
                 isShowXx=#{isShowXx},
             </if>
+            <if test="isImport != null">
+                isImport=#{isImport},
+            </if>
         </set>
         WHERE id = #{id}
     </update>
@@ -127,7 +134,7 @@
         SELECT *
         FROM sys_custom_config_detail
         WHERE (
-                  id = #{id})
+        id = #{id})
         limit 1
     </select>
 </mapper>