From d14764d097691d35e7015c2d161c612aa7642a8e Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 27 五月 2026 17:23:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

---
 src/main/resources/mapper/device/DeviceRepairMapper.xml |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index d82119b..7970318 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -46,8 +46,12 @@
             <if test="deviceRepairDto.maintenanceName != null">
                 and dr.maintenance_name like concat('%',#{deviceRepairDto.maintenanceName},'%')
             </if>
-
-
+            <if test="deviceRepairDto.repairTimeStart != null">
+                and dr.repair_time_start &gt;= #{deviceRepairDto.repairTimeStart}
+            </if>
+            <if test="deviceRepairDto.repairTimeEnd != null">
+                and dr.repair_time_end &lt;= #{deviceRepairDto.repairTimeEnd}
+            </if>
             <if test="deviceRepairDto.maintenanceTimeStr != null and deviceRepairDto.maintenanceTimeStr != '' ">
                 and dr.maintenance_time like concat('%',#{deviceRepairDto.maintenanceTimeStr},'%')
             </if>

--
Gitblit v1.9.3