From f601284ce801e948438d632ec050ec6d6f457e11 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 24 四月 2026 16:02:20 +0800
Subject: [PATCH] fix: 供应商往来付款金额修改
---
src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
index 29acb67..1a38815 100644
--- a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
+++ b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
@@ -183,31 +183,37 @@
</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_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
+ T1.invoiceAmount,
+ IFNULL(T2.paymentAmount, 0) AS paymentAmount,
+ (T1.invoiceAmount - IFNULL(T2.paymentAmount, 0)) AS payableAmount
FROM (
- SELECT id,supplier_id, supplier_name, SUM(contract_amount) contract_amount
+ SELECT
+ supplier_id,
+ supplier_name,
+ SUM(contract_amount) AS invoiceAmount
FROM purchase_ledger
- GROUP BY supplier_id, supplier_name,id
- ) 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},'%')
+ AND supplier_name LIKE CONCAT ('%',#{req.supplierName},'%')
</if>
</where>
- GROUP BY T1.supplier_id, T1.supplier_name
+ GROUP BY supplier_id, supplier_name
+ ) T1
+ LEFT JOIN (
+ SELECT
+ supplier_id,
+ SUM(current_payment_amount) AS paymentAmount
+ FROM payment_registration
+ GROUP BY supplier_id
+ ) T2 ON T1.supplier_id = T2.supplier_id
</select>
+
<select id="supplierNameListPageDetails" resultType="com.ruoyi.purchase.dto.PaymentRegistrationDto">
SELECT
T2.id,
--
Gitblit v1.9.3