From 2a1b82362b89328bffc383fc19dace3c05644adb Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Tue, 13 Dec 2022 16:37:49 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=86=85=E9=83=A8=E7=A0=81?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=8D=95=E6=8D=AE=E6=9F=A5=E8=AF=A2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/admin/req/inventory/InnerOrderRequest.java  | 5 +++++
 .../resources/mybatis/mapper/inventory/InnerOrderDao.xml     | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/InnerOrderRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/InnerOrderRequest.java
index 920e1da2..f3c72b83 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/InnerOrderRequest.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/InnerOrderRequest.java
@@ -8,4 +8,9 @@ public class InnerOrderRequest extends ListPageRequest {
 
 
     private String recordKey;
+
+    private String startDate;
+
+    private String endDate;
+
 }
diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InnerOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InnerOrderDao.xml
index d1bcffdc..bcf1da8b 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InnerOrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InnerOrderDao.xml
@@ -12,8 +12,11 @@
             <if test="recordKey != '' and recordKey != null">
                 AND recordKey = #{recordKey}
             </if>
+            <if test="startDate != null and startDate != '' and endDate != null and endDate != ''">
+                AND date_format(inv_inner_order.createTime, '%Y-%m-%d') between date_format(#{startDate},
+                '%Y-%m-%d') and date_format(#{endDate}, '%Y-%m-%d')
+            </if>
         </where>
-
     </select>
 
     <insert id="insert" keyProperty="id"