From 4f55d3cb4bc644e4534106336f2047af1a4db5df Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 29 五月 2026 18:09:46 +0800
Subject: [PATCH] feat(config): 添加新环境配置并扩展设备台账功能

---
 src/main/resources/mapper/device/DeviceMaintenanceMapper.xml |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
index cb05e72..a25d13a 100644
--- a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
+++ b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
@@ -8,6 +8,7 @@
     <select id="queryPage" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto">
         select dm.id,
         dm.device_ledger_id,
+        dm.area_id,
         dm.maintenance_plan_time,
         dm.maintenance_actually_time,
         dm.maintenance_result,
@@ -21,9 +22,11 @@
         dl.device_name,
         dm.machinery_category,
         dl.device_model,
+        da.area_name,
         su.nick_name as create_user_name
         from device_maintenance dm
         left join device_ledger dl on dm.device_ledger_id = dl.id
+        left join device_area da on dl.area_id = da.id
         left join sys_user su on dm.create_user = su.user_id
         <where>
             <if test="deviceMaintenanceDto.deviceName != null">
@@ -48,12 +51,16 @@
                 and dm.maintenance_actually_time >= str_to_date(#{deviceMaintenanceDto.maintenanceActuallyTime}, '%Y-%m-%d')
                 and dm.maintenance_actually_time &lt; date_add(str_to_date(#{deviceMaintenanceDto.maintenanceActuallyTime}, '%Y-%m-%d'), interval 1 day)
             </if>
+            <if test="deviceMaintenanceDto.areaId != null">
+                and dm.area_id = #{deviceMaintenanceDto.areaId}
+            </if>
         </where>
         order by dm.create_time desc
     </select>
     <select id="detailById" resultType="com.ruoyi.device.vo.DeviceMaintenanceVo">
         select dm.id,
                dm.device_ledger_id,
+               dm.area_id,
                dm.maintenance_plan_time,
                dm.maintenance_actually_time,
                dm.maintenance_result,
@@ -67,9 +74,11 @@
                dm.maintenance_actually_name,
                dl.device_name,
                dl.device_model,
+               da.area_name,
                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 device_area da on dl.area_id = da.id
                  left join sys_user su on dm.create_user = su.user_id
         where dm.id = #{id}
     </select>

--
Gitblit v1.9.3