From 32ab573a75133213b9ea46a9ab87f6463683f46a Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Thu, 5 Sep 2024 09:43:25 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=80=E5=94=AE=E5=90=8E=E7=AB=AF=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=92=8C=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=EF=BC=9A=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=BD=95=E5=85=A5=E6=97=B6=E9=97=B4=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E7=AD=9B=E9=80=89=E7=9A=84=E9=97=AE=E9=A2=98=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E6=A0=B9=E6=8D=AE=E5=BD=95=E5=85=A5=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E8=BF=9B=E8=A1=8C=E5=AF=BC=E5=87=BA=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/system/SysSalesOrderMapper.xml    | 6 ++++++
 .../resources/templates/system/salesOrder/salesOrder.html   | 6 ++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml
index 1464f858..5696e063 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml
@@ -127,6 +127,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deliveryStatus != null  and deliveryStatus != ''"> and s.delivery_status = #{deliveryStatus}</if>
             <if test="closeStatus != null  and closeStatus != ''"> and s.close_status = #{closeStatus}</if>
             <if test="invoice != null  and invoice != ''"> and s.invoice = #{invoice}</if>
+            <if test="params.beginCreateTime != null  and params.beginCreatTime != ''  and params.endCreateTime != null and params.endCreateTime != '' ">
+                and s.create_time between #{params.beginCreateTime} and #{params.endCreateTime}
+            </if>
             <if test="materialCode != null and materialCode != ''"> and c.materialCode like concat('%', #{materialCode}, '%')</if>
             <if test="materialName != null and materialName != ''">
                 and c.materialName like concat('%',#{materialName},'%')
@@ -187,6 +190,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deliveryStatus != null  and deliveryStatus != ''"> and s.delivery_status = #{deliveryStatus}</if>
             <if test="closeStatus != null  and closeStatus != ''"> and s.close_status = #{closeStatus}</if>
             <if test="invoice != null  and invoice != ''"> and s.invoice = #{invoice}</if>
+            <if test="params.beginCreateTime != null  and params.beginCreatTime != ''  and params.endCreateTime != null and params.endCreateTime != '' ">
+                and s.create_time between #{params.beginCreateTime} and #{params.endCreateTime}
+            </if>
             <if test="materialCode != null and materialCode != ''"> and c.materialCode like concat('%', #{materialCode}, '%')</if>
             <if test="materialName != null and materialName != ''">
                 and c.materialName like concat('%',#{materialName},'%')
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html
index e1a1d219..07f7f82f 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html
@@ -169,9 +169,9 @@
                         </li>
                         <li class="select-time">
                             <label>录入时间： </label>
-                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
                             <span>-</span>
-                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
                         </li>
                         <li>
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
@@ -255,8 +255,6 @@
             cancelUrl: prefix + "/cancel/{id}",
             detailUrl: prefix + "/detail/{id}",
             pagination: true,
-            pageList: [5, 10, 25, 50],
-            pageSize: 10,
             sortable: true,                                     // 是否启用排序
             sortStable: true,                                   // 设置为 true 将获得稳定的排序
             fixedColumns: true, // 启用冻结列