From 838c96954a610c1caca112b0577825c65b69bb54 Mon Sep 17 00:00:00 2001 From: liyong <18434998025@163.com> Date: 星期四, 03 七月 2025 14:53:15 +0800 Subject: [PATCH] 2025-07-03 设备bug修改 --- src/main/resources/mapper/device/DeviceMaintenanceMapper.xml | 26 ++++++++++++++++++++++++-- src/main/resources/mapper/device/DeviceRepairMapper.xml | 30 +++++++++++++++--------------- 2 files changed, 39 insertions(+), 17 deletions(-) diff --git a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml index 2529b0a..0cf426a 100644 --- a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml +++ b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml @@ -6,7 +6,18 @@ <mapper namespace="com.ruoyi.device.mapper.DeviceMaintenanceMapper"> <select id="queryPage" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto"> - select dm.*, + select dm.id, + dm.device_ledger_id, + dm.maintenance_plan_time, + dm.maintenance_actually_time, + dm.maintenance_result, + dm.status, + dm.create_time, + dm.update_time, + dm.create_user, + dm.update_user, + dm.tenant_id, + dm.maintenance_actually_name, dl.device_name, dl.device_model, su.user_name as create_user_name @@ -23,7 +34,18 @@ </where> </select> <select id="detailById" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto"> - select dm.*, + select dm.id, + dm.device_ledger_id, + dm.maintenance_plan_time, + dm.maintenance_actually_time, + dm.maintenance_result, + dm.status, + dm.create_time, + dm.update_time, + dm.create_user, + dm.update_user, + dm.tenant_id, + dm.maintenance_actually_name, dl.device_name, dl.device_model, su.user_name as create_user_name diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml index cd78797..cc88490 100644 --- a/src/main/resources/mapper/device/DeviceRepairMapper.xml +++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml @@ -34,24 +34,24 @@ </where> </select> <select id="detailById" resultType="com.ruoyi.device.dto.DeviceRepairDto"> - select select dr.id, - dr.device_ledger_id, - dr.repair_time, - dr.repair_name, - dr.remark, - dr.maintenance_name, - dr.maintenance_time, - dr.maintenance_result, - dr.status, - dr.create_time, - dr.update_time, - dr.create_user, - dr.update_user, - dr.tenant_id, + select dr.id, + dr.device_ledger_id, + dr.repair_time, + dr.repair_name, + dr.remark, + dr.maintenance_name, + dr.maintenance_time, + dr.maintenance_result, + dr.status, + dr.create_time, + dr.update_time, + dr.create_user, + dr.update_user, + dr.tenant_id, dl.device_name, dl.device_model from device_repair dr - left join device_ledger dl on dr.device_ledger_id = dl.id + left join device_ledger dl on dr.device_ledger_id = dl.id where dr.id = #{id} </select> -- Gitblit v1.9.3