From e9127d8868204e48ccec8010bb9774b0756fa55b Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 22 四月 2026 16:45:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_河南_鹤壁天沐钢化玻璃厂' into dev_河南_鹤壁天沐钢化玻璃厂
---
src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
index 44707d3..b2517db 100644
--- a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
+++ b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
@@ -151,6 +151,7 @@
<select id="paymentHistoryListPage" resultType="com.ruoyi.purchase.dto.PaymentRegistrationDto">
SELECT
+ T1.id,
T1.payment_date,
T2.supplier_name,
T1.current_payment_amount,
@@ -163,11 +164,9 @@
FROM
payment_registration T1
LEFT JOIN purchase_ledger t4 ON t4.id = T1.purchase_ledger_id
- LEFT JOIN
- supplier_manage T2 ON T1.supplier_id = T2.id
- LEFT JOIN
- sys_user T3 ON T3.user_id = T1.registrant_id
- left join ticket_registration t5 on t5.purchase_ledger_id = T1.purchase_ledger_id
+ LEFT JOIN supplier_manage T2 ON T1.supplier_id = T2.id
+ LEFT JOIN sys_user T3 ON T3.user_id = T1.registrant_id
+ left join ticket_registration t5 on t5.id = T1.ticket_registration_id
<where>
<if test="params.searchText != null and params.searchText != '' ">
AND T2.supplier_name LIKE CONCAT('%',#{params.searchText},'%')
@@ -178,8 +177,54 @@
<if test="params.paymentDateEnd != null and params.paymentDateEnd !='' ">
AND T1.payment_date <= date_format(#{params.paymentDateEnd},'%Y-%m-%d')
</if>
+ <if test="params.purchaseContractNumber != null and params.purchaseContractNumber !='' ">
+ AND t4.purchase_contract_number LIKE CONCAT('%',#{params.purchaseContractNumber},'%')
+ </if>
</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