From c51043703dd5fd8dfb707fdf56df05b00d06207a Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Sat, 3 Aug 2024 22:01:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=E6=A3=80=E7=B4=A2=E5=88=97=E5=90=8D=E6=9C=AA=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E5=8C=96=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/generator/mapper.xml.vm   | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/templates/generator/mapper.xml.vm b/src/main/resources/templates/generator/mapper.xml.vm
index 28fb787e..0c874c84 100644
--- a/src/main/resources/templates/generator/mapper.xml.vm
+++ b/src/main/resources/templates/generator/mapper.xml.vm
@@ -36,15 +36,24 @@
                 <if test="queryParams.${fieldConfig.fieldName}.size() > 0">
                     AND ${fieldConfig.columnName} IN  <foreach collection="queryParams.${fieldConfig.fieldName}" item="item" open="(" close=")" separator=",">#{item}</foreach>
                 </if>
-                            #elseif($queryType == "BETWEEN")
+                #elseif($queryType == "BETWEEN")
+                    #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 u.create_time &gt;= #{startDate}
+                    AND ${fieldConfig.fieldName} &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 u.create_time &lt;= #{endDate}
+                    AND ${fieldConfig.fieldName} &lt;= #{endDate}
                 </if>
+                    #else
+                <if test="queryParams.${fieldConfig.fieldName}[0] != null and queryParams.${fieldConfig.fieldName}[0] != ''">
+                    AND ${fieldConfig.fieldName} &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]}
+                </if>
+                    #end
                             #elseif($queryType == "GT")
                 AND ${fieldConfig.columnName} > #{queryParams.${fieldConfig.fieldName}}
                             #elseif($queryType == "GE")