From 33c8278a6a6fcbb5100038e5188a64f17cd12c57 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Sat, 24 Aug 2024 23:30:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=E5=92=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/youlai/system/enums/FormTypeEnum.java | 4 ++--
 src/main/resources/templates/generator/mapper.xml.vm    | 8 ++++----
 src/main/resources/templates/generator/query.java.vm    | 1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/youlai/system/enums/FormTypeEnum.java b/src/main/java/com/youlai/system/enums/FormTypeEnum.java
index 349cbd2d..81923ddc 100644
--- a/src/main/java/com/youlai/system/enums/FormTypeEnum.java
+++ b/src/main/java/com/youlai/system/enums/FormTypeEnum.java
@@ -55,12 +55,12 @@ public enum FormTypeEnum implements IBaseEnum<Integer> {
     /**
      * 日期时间框
      */
-    DATE_TIME(8, "日期时间框"),
+    DATE(8, "日期框"),
 
     /**
      * 日期框
      */
-    DATE(9, "日期框");
+    DATE_TIME(9, "日期时间框");
 
 
     //  Mybatis-Plus 提供注解表示插入数据库时插入该值
diff --git a/src/main/resources/templates/generator/mapper.xml.vm b/src/main/resources/templates/generator/mapper.xml.vm
index 0c874c84..f690e0ee 100644
--- a/src/main/resources/templates/generator/mapper.xml.vm
+++ b/src/main/resources/templates/generator/mapper.xml.vm
@@ -40,18 +40,18 @@
                     #if($fieldConfig.formType == "DATE" || $fieldConfig.formType == "DATE_TIME")
                 <if test="queryParams.${fieldConfig.fieldName}[0] != null and queryParams.${fieldConfig.fieldName}[0] != ''">
                     <bind name="startDate" value="queryParams.${fieldConfig.fieldName}[0].length() == 10 ? queryParams.${fieldConfig.fieldName}[0] + ' 00:00:00' : queryParams.${fieldConfig.fieldName}[0]"/>
-                    AND ${fieldConfig.fieldName} &gt;= #{startDate}
+                    AND ${fieldConfig.columnName} &gt;= #{startDate}
                 </if>
                 <if test="queryParams.${fieldConfig.fieldName}[1] != null and queryParams.${fieldConfig.fieldName}[1] != ''">
                     <bind name="endDate" value="queryParams.${fieldConfig.fieldName}[1].length() == 10 ? queryParams.${fieldConfig.fieldName}[1] + ' 23:59:59' : queryParams.${fieldConfig.fieldName}[1]"/>
-                    AND ${fieldConfig.fieldName} &lt;= #{endDate}
+                    AND ${fieldConfig.columnName} &lt;= #{endDate}
                 </if>
                     #else
                 <if test="queryParams.${fieldConfig.fieldName}[0] != null and queryParams.${fieldConfig.fieldName}[0] != ''">
-                    AND ${fieldConfig.fieldName} &gt;= #{queryParams.${fieldConfig.fieldName}[0]}
+                    AND ${fieldConfig.columnName} &gt;= #{queryParams.${fieldConfig.fieldName}[0]}
                 </if>
                 <if test="queryParams.${fieldConfig.fieldName}[1] != null and queryParams.${fieldConfig.fieldName}[1] != ''">
-                    AND ${fieldConfig.fieldName} &lt;= #{queryParams.${fieldConfig.fieldName}[1]}
+                    AND ${fieldConfig.columnName} &lt;= #{queryParams.${fieldConfig.fieldName}[1]}
                 </if>
                     #end
                             #elseif($queryType == "GT")
diff --git a/src/main/resources/templates/generator/query.java.vm b/src/main/resources/templates/generator/query.java.vm
index 23815f9e..c75704ee 100644
--- a/src/main/resources/templates/generator/query.java.vm
+++ b/src/main/resources/templates/generator/query.java.vm
@@ -24,6 +24,7 @@ import java.math.BigDecimal;
 public class ${entityName}Query extends BasePageQuery {
 
     private static final long serialVersionUID = 1L;
+
 #if($fieldConfigs)
     #foreach($fieldConfig in ${fieldConfigs})
         #if($fieldConfig.isShowInQuery)