From aab9f74b97df038154d507b6d17b6f96a8337efc Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 03 七月 2025 13:46:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/device/DeviceMaintenanceMapper.xml | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
index 9072d29..2529b0a 100644
--- a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
+++ b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
@@ -8,17 +8,29 @@
<select id="queryPage" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto">
select dm.*,
dl.device_name,
- dl.device_model
+ dl.device_model,
+ su.user_name as create_user_name
from device_maintenance dm
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="deviceRepairDto.deviceName != null">
- and dl.device_name like concat('%',#{deviceRepairDto.deviceName},'%')
+ <if test="deviceMaintenanceDto.deviceName != null">
+ and dl.device_name like concat('%',#{deviceMaintenanceDto.deviceName},'%')
</if>
- <if test="deviceRepairDto.deviceModel != null">
- and dl.device_model like concat('%',#{deviceRepairDto.deviceModel},'%')
+ <if test="deviceMaintenanceDto.deviceModel != null">
+ and dl.device_model like concat('%',#{deviceMaintenanceDto.deviceModel},'%')
</if>
</where>
</select>
+ <select id="detailById" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto">
+ select dm.*,
+ dl.device_name,
+ dl.device_model,
+ su.user_name as create_user_name
+ from device_maintenance dm
+ 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 dm.id = #{id}
+ </select>
</mapper>
--
Gitblit v1.9.3