From 4e6526f74c163c23670a719fe9be82f8eee5734f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8D=92?= <van666666@foxmail.com>
Date: Sat, 13 Sep 2025 22:32:00 +0800
Subject: [PATCH] 1

---
 .../web/controller/system/JDOrderListController.java  | 11 +++++++++++
 .../main/resources/mapper/jarvis/JDOrderMapper.xml    |  8 ++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java
index 1edbf5b..564963a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java
@@ -46,6 +46,17 @@ public class JDOrderListController extends BaseController
         String orderBy = getRequest().getParameter("orderBy");
         String isAsc = getRequest().getParameter("isAsc");
         
+        // 处理时间筛选参数
+        String beginTimeStr = getRequest().getParameter("beginTime");
+        String endTimeStr = getRequest().getParameter("endTime");
+        
+        if (beginTimeStr != null && !beginTimeStr.isEmpty()) {
+            query.getParams().put("beginTime", beginTimeStr);
+        }
+        if (endTimeStr != null && !endTimeStr.isEmpty()) {
+            query.getParams().put("endTime", endTimeStr);
+        }
+        
         java.util.List<JDOrder> list;
         if (orderBy != null && !orderBy.isEmpty()) {
             // 设置排序参数
diff --git a/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml b/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml
index 1e5e8b9..c29a9f3 100644
--- a/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml
@@ -42,10 +42,10 @@
             <if test="orderTime != null"> and order_time = #{orderTime}</if>
             <if test="status != null and status != ''"> and status like concat('%', #{status}, '%')</if>
             <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-                and order_time &gt;= #{params.beginTime}
+                and date(order_time) &gt;= #{params.beginTime}
             </if>
             <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-                and order_time &lt;= #{params.endTime}
+                and date(order_time) &lt;= #{params.endTime}
             </if>
         </where>
         order by remark asc, order_time desc, id desc
@@ -67,10 +67,10 @@
             <if test="orderTime != null"> and order_time = #{orderTime}</if>
             <if test="status != null and status != ''"> and status like concat('%', #{status}, '%')</if>
             <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-                and order_time &gt;= #{params.beginTime}
+                and date(order_time) &gt;= #{params.beginTime}
             </if>
             <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-                and order_time &lt;= #{params.endTime}
+                and date(order_time) &lt;= #{params.endTime}
             </if>
         </where>
         <choose>