From 3d556b8defe1ff5b9aeb481bd1d0a67b2ded0192 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 27 五月 2026 11:31:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/resources/mapper/device/DeviceMaintenanceMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
index e166457..cb05e72 100644
--- a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
+++ b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
@@ -26,7 +26,6 @@
left join device_ledger dl on dm.device_ledger_id = dl.id
left join sys_user su on dm.create_user = su.user_id
<where>
- 1 = 1
<if test="deviceMaintenanceDto.deviceName != null">
and dl.device_name like concat('%',#{deviceMaintenanceDto.deviceName},'%')
</if>
@@ -50,8 +49,9 @@
and dm.maintenance_actually_time < date_add(str_to_date(#{deviceMaintenanceDto.maintenanceActuallyTime}, '%Y-%m-%d'), interval 1 day)
</if>
</where>
+ order by dm.create_time desc
</select>
- <select id="detailById" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto">
+ <select id="detailById" resultType="com.ruoyi.device.vo.DeviceMaintenanceVo">
select dm.id,
dm.device_ledger_id,
dm.maintenance_plan_time,
--
Gitblit v1.9.3