From d5170bf548fd2256c6f58837090aebce02dbe5fd Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Wed, 18 Dec 2024 16:14:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2-?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/material/order/OrderInfoMapper.xml   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
index 2d612ff..300e837 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
@@ -340,6 +340,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN sys_dept sd ON moi.buyer_company = sd.dept_id
         WHERE
             md.ma_id = #{maId}
+        <if test="orderCode != null and orderCode != ''">
+            AND moi.`code` like concat( '%',#{orderCode},'%' )
+        </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            AND ((md.rent_begin_time BETWEEN #{startTime} AND #{endTime})
+            OR (md.rent_end_time BETWEEN #{startTime} AND #{endTime})
+            OR (md.rent_begin_time &lt; #{startTime} AND md.rent_end_time > #{endTime}))
+        </if>
         ORDER BY
             moi.order_time DESC
     </select>

From 6ea7ceefa60738670fb7fa03cc298c402897ef28 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Wed, 18 Dec 2024 16:33:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2-?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/material/device/domain/vo/DevInfoVo.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java
index 8d60201..3652230 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java
@@ -149,4 +149,7 @@ public class DevInfoVo extends DevInfo {
     @ApiModelProperty(value = "结束时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String endTime;
+
+    @ApiModelProperty(value = "订单编码")
+    private String orderCode;
 }