From ee690149bcf516b72df8f12916d5d93319bf55d5 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 27 五月 2026 17:18:36 +0800
Subject: [PATCH] feat 页面显示巡检状态

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

diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index ab11bd2..7970318 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -8,9 +8,11 @@
     <select id="queryPage" resultType="com.ruoyi.device.dto.DeviceRepairDto">
         select dr.id,
                dr.device_ledger_id,
-                dr.repair_time,
                 dr.repair_name,
                 dr.remark,
+                dr.repair_project,
+                dr.repair_time_start as repairTimeStart,
+                dr.repair_time_end as repairTimeEnd,
                 dr.maintenance_name,
                 dr.maintenance_time,
                 dr.maintenance_result,
@@ -33,29 +35,37 @@
                 and dl.device_model like concat('%',#{deviceRepairDto.deviceModel},'%')
             </if>
             <if test="deviceRepairDto.status != null">
-                and dl.status = #{deviceRepairDto.status}
+                and dr.status = #{deviceRepairDto.status}
             </if>
             <if test="deviceRepairDto.remark != null">
                 and dr.remark like concat('%',#{deviceRepairDto.remark},'%')
             </if>
+            <if test="deviceRepairDto.repairProject != null">
+                and dr.repair_project like concat('%',#{deviceRepairDto.repairProject},'%')
+            </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 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>
         </where>
+        order by dr.status asc, dr.create_time desc
     </select>
     <select id="detailById" resultType="com.ruoyi.device.dto.DeviceRepairDto">
         select dr.id,
                dr.device_ledger_id,
-               dr.repair_time,
                dr.repair_name,
                dr.remark,
+               dr.repair_project,
+               dr.repair_time_start as repairTimeStart,
+               dr.repair_time_end as repairTimeEnd,
                dr.maintenance_name,
                dr.maintenance_time,
                dr.maintenance_result,

--
Gitblit v1.9.3