From f7942187e08a2f9910f76f66117b30973b4db11d Mon Sep 17 00:00:00 2001
From: "K.X" <xuxiang999@gmail.com>
Date: Fri, 28 Mar 2025 09:34:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=99=AE=E9=80=9A=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E6=A1=86=E5=AD=97=E6=AE=B5=E5=A6=82=E6=9E=9C=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=96=B9=E5=BC=8F=E4=B8=BABETWEEN=EF=BC=8Clist.html?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=AD=A3=E7=A1=AE=E7=94=9F=E6=88=90=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/vm/html/list-tree.html.vm  | 19 +++++++++++++------
 .../src/main/resources/vm/html/list.html.vm   | 17 ++++++++++++-----
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/ruoyi-generator/src/main/resources/vm/html/list-tree.html.vm b/ruoyi-generator/src/main/resources/vm/html/list-tree.html.vm
index dcb91e83c..3b7579310 100644
--- a/ruoyi-generator/src/main/resources/vm/html/list-tree.html.vm
+++ b/ruoyi-generator/src/main/resources/vm/html/list-tree.html.vm
@@ -17,14 +17,21 @@
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
 #if($parentheseIndex != -1)
 #set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else  
+#else
 #set($comment=$column.columnComment)
-#end  
-#if($column.htmlType == "input")
+#end
+#if($column.htmlType == "input" && $column.queryType != "BETWEEN")
                             <li>
                                 <label>${comment}：</label>
                                 <input type="text" name="${column.javaField}"/>
                             </li>
+#elseif($column.htmlType == "input" && $column.queryType == "BETWEEN")
+                            <li class="select-time">
+                                <label>${comment}：</label>
+                                <input type="text" id="begin${AttrName}" placeholder="开始${comment}" name="params[begin${AttrName}]"/>
+                                <span>-</span>
+                                <input type="text" id="end${AttrName}" placeholder="结束${comment}" name="params[end${AttrName}]"/>
+                            </li>
 #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
                             <li>
                                 <label>${comment}：</label>
@@ -52,7 +59,7 @@
                                 <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[begin${AttrName}]"/>
                                 <span>-</span>
                                 <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[end${AttrName}]"/>
-                            </li>                
+                            </li>
 #end
 #end
 #end
@@ -133,7 +140,7 @@
                     title: '${comment}',
                     align: 'left'
                 },
-#end                
+#end
 #end
                 {
                     title: '操作',
@@ -152,4 +159,4 @@
         });
     </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/ruoyi-generator/src/main/resources/vm/html/list.html.vm b/ruoyi-generator/src/main/resources/vm/html/list.html.vm
index a7021a371..749cb9685 100644
--- a/ruoyi-generator/src/main/resources/vm/html/list.html.vm
+++ b/ruoyi-generator/src/main/resources/vm/html/list.html.vm
@@ -17,14 +17,21 @@
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
 #if($parentheseIndex != -1)
 #set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else  
+#else
 #set($comment=$column.columnComment)
-#end  
-#if($column.htmlType == "input")
+#end
+#if($column.htmlType == "input" && $column.queryType != "BETWEEN")
                             <li>
                                 <label>${comment}：</label>
                                 <input type="text" name="${column.javaField}"/>
                             </li>
+#elseif($column.htmlType == "input" && $column.queryType == "BETWEEN")
+                            <li class="select-time">
+                                <label>${comment}：</label>
+                                <input type="text" id="begin${AttrName}" placeholder="开始${comment}" name="params[begin${AttrName}]"/>
+                                <span>-</span>
+                                <input type="text" id="end${AttrName}" placeholder="结束${comment}" name="params[end${AttrName}]"/>
+                            </li>
 #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
                             <li>
                                 <label>${comment}：</label>
@@ -134,7 +141,7 @@
                     field: '${javaField}',
                     title: '${comment}'
                 },
-#end                
+#end
 #end
                 {
                     title: '操作',
@@ -151,4 +158,4 @@
         });
     </script>
 </body>
-</html>
\ No newline at end of file
+</html>