From 0e6da184ed0a6d511a17e1ed86a470cda71c0f3b Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 22 九月 2025 16:51:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationPurchaseItemMapper.xml | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationPurchaseItemMapper.xml b/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationPurchaseItemMapper.xml
index 8880cf9..2594ff7 100644
--- a/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationPurchaseItemMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationPurchaseItemMapper.xml
@@ -19,5 +19,12 @@
<sql id="Base_Column_List">
id, approval_application_id, asset_name, asset_type_id, spec, unit, quantity, price, total_amount
</sql>
+ <select id="pageList" resultType="com.ruoyi.system.vo.PurchaseListVO">
+ select t1.*,t2.type_name as assetTypeName
+ from oa_approval_application_purchase_item t1
+ left join asset_type t2 on t2.id = t1.asset_type_id
+ where t1.approval_application_id = #{query.approvalApplicationId}
+
+ </select>
</mapper>
--
Gitblit v1.7.1