From 5deaede4715d2703aadcd33f94256b339b9e9140 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 14 四月 2026 10:09:08 +0800
Subject: [PATCH] feat(sales): 添加发票和销售台账查询过滤功能
---
src/main/resources/mapper/device/DeviceMaintenanceMapper.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
index 2ed16a4..b9c67cb 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,
@@ -20,9 +21,11 @@
dm.maintenance_actually_name,
dl.device_name,
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 dm.area_id = da.id
left join sys_user su on dm.create_user = su.user_id
<where>
1 = 1
@@ -53,6 +56,7 @@
<select id="detailById" 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,
@@ -65,9 +69,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 dm.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