From 5954d53400d786dadf7c3023e6e1b921e7293116 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 12 三月 2026 11:47:23 +0800
Subject: [PATCH] yys 修改供应商往来bug
---
src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
index 26a405b..215d31b 100644
--- a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
+++ b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
@@ -129,24 +129,61 @@
SELECT * FROM(
SELECT
T1.issue_date AS happenTime,
- IFNULL(T1.invoice_amount,0) AS invoiceAmount,
+ sum(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}
+ GROUP BY T1.issue_date
UNION
SELECT
payment_date AS happenTime,
0 AS invoiceAmount,
'0' AS type,
- current_payment_amount AS currentPaymentAmount
+ sum(ifnull(current_payment_amount,0)) AS currentPaymentAmount
FROM payment_registration
WHERE supplier_id = #{supplierId}
+ GROUP BY payment_date
) 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 >= date_format(#{params.paymentDateStart},'%Y-%m-%d')
+ </if>
+ <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>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3