From beb0fc04f59f4f448e70d8de9ae39161632de2fb Mon Sep 17 00:00:00 2001 From: liyong <18434998025@163.com> Date: 星期四, 03 七月 2025 11:22:28 +0800 Subject: [PATCH] 2025-07-01 添加设备维修保养的设备名称合型号字段 --- 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