From 60d295c68e038b9e107e29630466045310a56daa Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 22 四月 2026 18:18:33 +0800
Subject: [PATCH] fix: 付款登记筛选有误
---
src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml | 45 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 44 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
index d8b9241..b2517db 100644
--- a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
+++ b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
@@ -183,5 +183,48 @@
</where>
ORDER BY T1.payment_date,T1.create_time DESC
</select>
+ <select id="supplierNameListPage" resultType="com.ruoyi.purchase.dto.PaymentRegistrationDto">
+ SELECT
+ T1.supplier_id ,
+ T1.supplier_name,
+ SUM(T1.contract_amount) AS invoiceAmount,
+ IFNULL(SUM(T2.current_payment_amount), 0) AS paymentAmount,
+ IFNULL(SUM(T1.contract_amount) - IFNULL(SUM(T2.current_payment_amount), 0), 0) AS payableAmount
+FROM (
+ SELECT id,supplier_id, supplier_name, SUM(contract_amount) contract_amount
+ FROM purchase_ledger
+ GROUP BY supplier_id, supplier_name
+) T1
+LEFT JOIN (
+ SELECT purchase_ledger_id, SUM(current_payment_amount) current_payment_amount
+ FROM payment_registration
+ GROUP BY purchase_ledger_id
+) T2 ON T1.id = T2.purchase_ledger_id
+<where>
+ <if test="req.supplierName != null and req.supplierName != '' ">
+ T1.supplier_name LIKE CONCAT ('%',#{req.supplierName},'%')
+ </if>
+</where>
+GROUP BY T1.supplier_id, T1.supplier_name
+ </select>
-</mapper>
\ No newline at end of file
+ <select id="supplierNameListPageDetails" resultType="com.ruoyi.purchase.dto.PaymentRegistrationDto">
+ SELECT
+ T1.purchase_contract_number,
+ T1.contract_amount AS invoiceAmount,
+ IFNULL(SUM(T2.current_payment_amount), 0) AS paymentAmount,
+ IFNULL((T1.contract_amount - IFNULL(SUM(T2.current_payment_amount), 0)), 0) AS payableAmount,
+ T2.payment_date
+ FROM purchase_ledger T1
+ INNER JOIN payment_registration T2 ON T1.id = T2.purchase_ledger_id
+ <where>
+ T1.supplier_id = #{req.supplierId}
+ <if test="req.supplierName != null and req.supplierName != '' ">
+ AND T1.supplier_name LIKE CONCAT ('%', #{req.supplierName}, '%')
+ </if>
+ </where>
+ GROUP BY T1.id, T1.purchase_contract_number, T1.contract_amount, T2.payment_date
+
+ </select>
+
+</mapper>
--
Gitblit v1.9.3