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/DeviceLedgerMapper.xml | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceLedgerMapper.xml b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
index f3b674e..efae5cc 100644
--- a/src/main/resources/mapper/device/DeviceLedgerMapper.xml
+++ b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
@@ -31,9 +31,14 @@
dl.tenant_id,
dl.is_depr,
dl.annual_depreciation_amount,
- dl.type
+ dl.type,
+ dl.area_id,
+ dl.is_iot_device,
+ dl.external_code,
+ da.area_name AS areaName
FROM device_ledger dl
left join sys_user su on dl.create_user = su.user_id
+ left join device_area da on dl.area_id = da.id
<where>
<!-- 璁惧鍚嶇О -->
<if test="deviceLedger.deviceName != null and deviceLedger.deviceName != ''">
@@ -76,6 +81,21 @@
<if test="deviceLedger.tenantId != null">
AND tenant_id = #{deviceLedger.tenantId}
</if>
+
+ <!-- 璁惧鍖哄煙 -->
+ <if test="deviceLedger.areaId != null">
+ AND dl.area_id = #{deviceLedger.areaId}
+ </if>
+
+ <!-- 鏄惁鐗╄仈璁惧 -->
+ <if test="deviceLedger.isIotDevice != null">
+ AND dl.is_iot_device = #{deviceLedger.isIotDevice}
+ </if>
+
+ <!-- 澶栭儴缂栫爜 -->
+ <if test="deviceLedger.externalCode != null and deviceLedger.externalCode != ''">
+ AND dl.external_code LIKE CONCAT('%', #{deviceLedger.externalCode}, '%')
+ </if>
</where>
ORDER BY create_time DESC
</select>
--
Gitblit v1.9.3