From 978a13e543afbb9210b923361af17aa006947244 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 23 七月 2025 14:12:17 +0800
Subject: [PATCH] yys  人员,质量,设备增加时间筛选

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

diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index cc88490..e8565d6 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -25,12 +25,26 @@
         from device_repair dr
         left join device_ledger dl on dr.device_ledger_id = dl.id
         <where>
+            1 = 1
             <if test="deviceRepairDto.deviceName != null">
                 and dl.device_name like concat('%',#{deviceRepairDto.deviceName},'%')
             </if>
             <if test="deviceRepairDto.deviceModel != null">
                 and dl.device_model like concat('%',#{deviceRepairDto.deviceModel},'%')
             </if>
+            <if test="deviceRepairDto.remark != null">
+                and dr.remark like concat('%',#{deviceRepairDto.remark},'%')
+            </if>
+            <if test="deviceRepairDto.maintenanceName != null">
+                and dr.maintenance_name like concat('%',#{deviceRepairDto.maintenanceName},'%')
+            </if>
+
+            <if test="deviceRepairDto.repairTimeStr != null and deviceRepairDto.repairTimeStr != '' ">
+                and dr.repair_time like concat('%',#{deviceRepairDto.repairTimeStr},'%')
+            </if>
+            <if test="deviceRepairDto.maintenanceTimeStr != null and deviceRepairDto.maintenanceTimeStr != '' ">
+                and dr.maintenance_time like concat('%',#{deviceRepairDto.maintenanceTimeStr},'%')
+            </if>
         </where>
     </select>
     <select id="detailById" resultType="com.ruoyi.device.dto.DeviceRepairDto">

--
Gitblit v1.9.3