From 09b817d9043b694eb8a8f217f476f73e21034585 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 27 五月 2026 16:17:32 +0800
Subject: [PATCH] feat 设备报修添加范围、巡检添加三个状态
---
src/main/resources/mapper/device/DeviceRepairMapper.xml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index de750a8..d82119b 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -8,10 +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,
@@ -46,21 +47,21 @@
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.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