From f32de021e7af1627b6d18e681b46dbc0a5b108f8 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 21 四月 2026 13:33:04 +0800
Subject: [PATCH] feat: 设备台账与工序进行绑定
---
src/main/resources/mapper/device/DeviceLedgerMapper.xml | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceLedgerMapper.xml b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
index c980120..c4a9616 100644
--- a/src/main/resources/mapper/device/DeviceLedgerMapper.xml
+++ b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
@@ -31,9 +31,12 @@
dl.tenant_id,
dl.is_depr,
dl.annual_depreciation_amount,
- dl.type
+ dl.type,
+ dl.product_process_id,
+ pp.name AS productProcessName
FROM device_ledger dl
left join sys_user su on dl.create_user = su.user_id
+ left join product_process pp on dl.product_process_id = pp.id
<where>
<!-- 璁惧鍚嶇О -->
<if test="deviceLedger.deviceName != null and deviceLedger.deviceName != ''">
@@ -43,6 +46,11 @@
<!-- 瑙勬牸鍨嬪彿 -->
<if test="deviceLedger.deviceModel != null and deviceLedger.deviceModel != ''">
AND device_model LIKE CONCAT('%', #{deviceLedger.deviceModel}, '%')
+ </if>
+
+ <!-- 宸ュ簭鍚嶇О -->
+ <if test="deviceLedger.productProcessName != null and deviceLedger.productProcessName != ''">
+ AND pp.name LIKE CONCAT('%', #{deviceLedger.productProcessName}, '%')
</if>
<!-- 渚涘簲鍟嗗悕绉� -->
@@ -83,9 +91,11 @@
</select>
<select id="selectById1" resultType="com.ruoyi.device.pojo.DeviceLedger">
- select *
- from device_ledger
- where id = #{id}
+ select dl.*,
+ pp.name as productProcessName
+ from device_ledger dl
+ left join product_process pp on dl.product_process_id = pp.id
+ where dl.id = #{id}
</select>
<select id="getDeviceTypeDistributionByYear"
resultType="com.ruoyi.account.dto.DeviceTypeDetail"
--
Gitblit v1.9.3