From c62fa713ee37db1ff7520d2ca6545f569395bb40 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 10 四月 2026 16:59:16 +0800
Subject: [PATCH] yys 1.app推送接口 2.数采缓存 3.数采历史数据
---
src/main/resources/mapper/device/DeviceRepairMapper.xml | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index 8969d0c..9bd2235 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -8,13 +8,13 @@
<select id="queryPage" resultType="com.ruoyi.device.dto.DeviceRepairDto">
select dr.id,
dr.device_ledger_id,
+ dr.area_id,
dr.repair_time,
dr.repair_name,
dr.remark,
dr.maintenance_name,
dr.maintenance_time,
dr.maintenance_result,
- dr.maintenance_price,
dr.status,
dr.create_time,
dr.update_time,
@@ -22,9 +22,11 @@
dr.update_user,
dr.tenant_id,
dl.device_name,
- dl.device_model
+ dl.device_model,
+ da.area_name
from device_repair dr
left join device_ledger dl on dr.device_ledger_id = dl.id
+ left join device_area da on dr.area_id = da.id
<where>
1 = 1
<if test="deviceRepairDto.deviceName != null">
@@ -54,13 +56,13 @@
<select id="detailById" resultType="com.ruoyi.device.dto.DeviceRepairDto">
select dr.id,
dr.device_ledger_id,
+ dr.area_id,
dr.repair_time,
dr.repair_name,
dr.remark,
dr.maintenance_name,
dr.maintenance_time,
dr.maintenance_result,
- dr.maintenance_price,
dr.status,
dr.create_time,
dr.update_time,
@@ -68,9 +70,11 @@
dr.update_user,
dr.tenant_id,
dl.device_name,
- dl.device_model
+ dl.device_model,
+ da.area_name
from device_repair dr
left join device_ledger dl on dr.device_ledger_id = dl.id
+ left join device_area da on dr.area_id = da.id
where dr.id = #{id}
</select>
--
Gitblit v1.9.3