From cd2ed591a01abcaef8dac4cc5ad3b398abacbaef Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期五, 28 八月 2026 11:13:41 +0800
Subject: [PATCH] feat: 环境配置
---
src/main/resources/mapper/device/DeviceLedgerMapper.xml | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceLedgerMapper.xml b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
index 2b14b90..0fb594b 100644
--- a/src/main/resources/mapper/device/DeviceLedgerMapper.xml
+++ b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
@@ -8,6 +8,16 @@
<select id="queryPage" resultType="com.ruoyi.device.dto.DeviceLedgerDto">
SELECT
dl.id,
+ dl.unique_code,
+ dl.factory_number,
+ dl.manufacturer,
+ dl.original_asset_value,
+ dl.purchase_date,
+ dl.activation_date,
+ dl.technical_parameters,
+ dl.main_purpose,
+ dl.responsible_person,
+ dl.filing_date,
dl.device_name,
dl.device_model,
dl.supplier_name,
@@ -28,10 +38,18 @@
dl.update_time ,
su.nick_name AS createUser,
dl.update_user,
- dl.tenant_id
+ dl.tenant_id,
+ dl.is_depr,
+ dl.annual_depreciation_amount,
+ dl.type
FROM device_ledger dl
left join sys_user su on dl.create_user = su.user_id
<where>
+ <!-- 璁惧缂栧彿 -->
+ <if test="deviceLedger.uniqueCode != null and deviceLedger.uniqueCode != ''">
+ AND unique_code LIKE CONCAT('%', #{deviceLedger.uniqueCode}, '%')
+ </if>
+
<!-- 璁惧鍚嶇О -->
<if test="deviceLedger.deviceName != null and deviceLedger.deviceName != ''">
AND device_name LIKE CONCAT('%', #{deviceLedger.deviceName}, '%')
@@ -84,5 +102,18 @@
from device_ledger
where id = #{id}
</select>
+ <select id="getDeviceTypeDistributionByYear"
+ resultType="com.ruoyi.account.bean.dto.DeviceTypeDetail"
+ parameterType="java.lang.Integer">
+ SELECT
+ `type`,
+ SUM(`number`) AS `count`,
+ SUM(tax_including_price_unit) AS amount
+ FROM device_ledger
+ WHERE YEAR(create_time) = #{year}
+ AND type IS NOT NULL
+ GROUP BY type
+ </select>
+
</mapper>
--
Gitblit v1.9.3