From 1b072f4955ed6abb89da353a2224c35f77f7e7df Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 23 四月 2026 15:14:33 +0800
Subject: [PATCH] fix: 供应商往来付款金额修改

---
 src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml |  108 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 107 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
index 16e4960..5107e91 100644
--- a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
+++ b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
@@ -125,4 +125,110 @@
         GROUP BY ticket_registration_id
     </select>
 
-</mapper>
\ No newline at end of file
+    <select id="getPaymentRecordList" resultType="com.ruoyi.purchase.dto.PaymentHistoryRecordVo">
+        SELECT * FROM(
+             SELECT
+                 T1.issue_date AS happenTime,
+                 IFNULL(T1.invoice_amount,0) AS invoiceAmount,
+                 '1' AS type,
+                 0 AS currentPaymentAmount
+             FROM
+                 ticket_registration T1
+                     LEFT JOIN purchase_ledger T2 ON T1.purchase_ledger_id = T2.id
+             WHERE T2.supplier_id = #{supplierId}
+             UNION
+             SELECT
+                 payment_date AS happenTime,
+                 0 AS invoiceAmount,
+                 '0' AS type,
+                 current_payment_amount AS currentPaymentAmount
+             FROM payment_registration
+             WHERE supplier_id = #{supplierId}
+        ) T1
+        ORDER BY T1.happenTime ASC
+
+    </select>
+
+    <select id="paymentHistoryListPage" resultType="com.ruoyi.purchase.dto.PaymentRegistrationDto">
+        SELECT
+        T1.id,
+        T1.payment_date,
+        T2.supplier_name,
+        T1.current_payment_amount,
+        T1.payment_method,
+        T3.nick_name AS registrant,
+        T1.registrationt_date,
+        t4.purchase_contract_number,
+        t5.invoice_amount,
+        t5.invoice_number
+        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.id = T1.ticket_registration_id
+        <where>
+            <if test="params.searchText != null and params.searchText != '' ">
+                AND T2.supplier_name LIKE CONCAT('%',#{params.searchText},'%')
+            </if>
+            <if test="params.paymentDateStart != null and params.paymentDateStart !='' ">
+                AND T1.payment_date &gt;= date_format(#{params.paymentDateStart},'%Y-%m-%d')
+            </if>
+            <if test="params.paymentDateEnd != null and params.paymentDateEnd !='' ">
+                AND T1.payment_date &lt;= 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,
+        T1.invoiceAmount,
+        IFNULL(T2.paymentAmount, 0) AS paymentAmount,
+        (T1.invoiceAmount - IFNULL(T2.paymentAmount, 0)) AS payableAmount
+        FROM (
+        SELECT
+        supplier_id,
+        supplier_name,
+        SUM(contract_amount) AS invoiceAmount
+        FROM purchase_ledger
+        <where>
+            <if test="req.supplierName != null and req.supplierName != '' ">
+                AND supplier_name LIKE CONCAT ('%',#{req.supplierName},'%')
+            </if>
+        </where>
+        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
+        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