From e69d2c5c515319500b485a921a17d74457ba0eb4 Mon Sep 17 00:00:00 2001 From: chenrui <1187576398@qq.com> Date: 星期五, 06 六月 2025 15:58:13 +0800 Subject: [PATCH] bug修复 --- src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml index 16e4960..26a405b 100644 --- a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml +++ b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml @@ -125,4 +125,28 @@ GROUP BY ticket_registration_id </select> + <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> + </mapper> \ No newline at end of file -- Gitblit v1.9.3