From 10b88a7ff17caf92f3d4e8a550c1085a70c2517a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 28 五月 2026 17:43:26 +0800
Subject: [PATCH] Merge dev_New_pro into dev_山西_晋和园_pro
---
src/main/resources/mapper/device/DeviceMaintenanceMapper.xml | 16 +++-------------
1 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
index 99b9bbc..9c1b6d5 100644
--- a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
+++ b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
@@ -26,8 +26,8 @@
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>
- <if test="deviceMaintenanceDto.deviceName != null and deviceMaintenanceDto.deviceName != ''">
- and dl.device_name like concat('%', #{deviceMaintenanceDto.deviceName}, '%')
+ <if test="deviceMaintenanceDto.deviceName != null">
+ and dl.device_name like concat('%',#{deviceMaintenanceDto.deviceName},'%')
</if>
<if test="deviceMaintenanceDto.deviceModel != null and deviceMaintenanceDto.deviceModel != ''">
and dl.device_model like concat('%', #{deviceMaintenanceDto.deviceModel}, '%')
@@ -48,17 +48,7 @@
date_add(str_to_date(#{deviceMaintenanceDto.maintenanceActuallyTime}, '%Y-%m-%d'), interval 1 day)
</if>
</where>
- order by
- <!-- 寰呬繚鍏�(0)浼樺厛鎺掑湪涓婇潰锛屽凡瀹岀粨(1)鍦ㄤ笅闈� -->
- dm.status asc,
- case
- <!-- 褰撶姸鎬佹槸 0锛堝緟淇濆吇锛夋椂锛屾寜璁″垝鏃堕棿鍗囧簭锛屽嵆鏃堕棿鏈�杩滅殑鍗曞瓙鍦ㄦ渶涓婇潰 -->
- when dm.status = 0 then dm.maintenance_plan_time
- end asc,
- case
- <!-- 褰撶姸鎬佹槸 1锛堝凡瀹岀粨锛夋椂锛屾寜瀹為檯淇濆吇鏃堕棿闄嶅簭锛屾渶杩戝垰淇濆吇瀹岀殑鍗曞瓙鍦ㄥ凡瀹岀粨閲屾帓鏈�鍓� -->
- when dm.status = 1 then dm.maintenance_actually_time
- end desc
+ order by dm.create_time desc
</select>
<select id="detailById" resultType="com.ruoyi.device.vo.DeviceMaintenanceVo">
--
Gitblit v1.9.3