From 4d99e718536ac77dff26dde8da7a59cdc9b52de8 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 20 五月 2026 10:13:57 +0800
Subject: [PATCH] fix:1.生产报工优化
---
src/main/resources/mapper/device/DeviceLedgerMapper.xml | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceLedgerMapper.xml b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
index 9cee459..de3f8d8 100644
--- a/src/main/resources/mapper/device/DeviceLedgerMapper.xml
+++ b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
@@ -11,6 +11,8 @@
dl.device_name,
dl.device_model,
dl.supplier_name,
+ dl.device_brand,
+ dl.storage_location,
dl.unit,
dl.number,
dl.status,
@@ -24,9 +26,12 @@
dl.un_tax_including_price_total,
dl.create_time,
dl.update_time ,
- su.user_name AS createUser,
+ 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>
@@ -72,7 +77,7 @@
AND tenant_id = #{deviceLedger.tenantId}
</if>
</where>
- ORDER BY create_time DESC
+ ORDER BY id
</select>
<select id="deviceLedgerExportList" resultType="com.ruoyi.device.execl.DeviceLedgerExeclDto">
@@ -82,5 +87,18 @@
from device_ledger
where id = #{id}
</select>
+ <select id="getDeviceTypeDistributionByYear"
+ resultType="com.ruoyi.account.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