From 7aad06fedc12f0183734088fa44c929ac6ff42b3 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 10 十月 2026 11:54:01 +0800
Subject: [PATCH] feat: 增加多个查询的排序功能以优化数据检索

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

diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index 6b6929a..27670c5 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -32,13 +32,24 @@
             <if test="deviceRepairDto.deviceModel != null">
                 and dl.device_model like concat('%',#{deviceRepairDto.deviceModel},'%')
             </if>
+            <if test="deviceRepairDto.status != null">
+                and dr.status = #{deviceRepairDto.status}
+            </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>
+        ORDER BY dr.id DESC
     </select>
     <select id="detailById" resultType="com.ruoyi.device.dto.DeviceRepairDto">
         select dr.id,

--
Gitblit v1.9.3