From 30ef534fcffe0520bebe7a34abe69d7afbbf227f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 13 八月 2026 13:53:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_西宁_湟水峡' into dev_西宁_湟水峡
---
src/main/resources/mapper/device/DeviceRepairMapper.xml | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index e8565d6..8578e7c 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -21,7 +21,8 @@
dr.update_user,
dr.tenant_id,
dl.device_name,
- dl.device_model
+ dl.device_model,
+ dr.machinery_category
from device_repair dr
left join device_ledger dl on dr.device_ledger_id = dl.id
<where>
@@ -31,6 +32,9 @@
</if>
<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},'%')
@@ -46,6 +50,7 @@
and dr.maintenance_time like concat('%',#{deviceRepairDto.maintenanceTimeStr},'%')
</if>
</where>
+ order by dr.repair_time desc
</select>
<select id="detailById" resultType="com.ruoyi.device.dto.DeviceRepairDto">
select dr.id,
@@ -63,6 +68,7 @@
dr.update_user,
dr.tenant_id,
dl.device_name,
+ dr.machinery_category,
dl.device_model
from device_repair dr
left join device_ledger dl on dr.device_ledger_id = dl.id
--
Gitblit v1.9.3