From 1bfc94359788ad4fe84a6079a77c7b3116f9679b Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 25 八月 2025 17:48:19 +0800
Subject: [PATCH] yys
---
src/main/resources/mapper/sales/ReceiptPaymentMapper.xml | 1 +
src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml | 7 +++++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
index 9cdc5a3..44707d3 100644
--- a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
+++ b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
@@ -157,14 +157,17 @@
T1.payment_method,
T3.nick_name AS registrant,
T1.registrationt_date,
- t4.purchase_contract_number
+ 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 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
<where>
<if test="params.searchText != null and params.searchText != '' ">
AND T2.supplier_name LIKE CONCAT('%',#{params.searchText},'%')
diff --git a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
index df06df6..b70a04b 100644
--- a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
+++ b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
@@ -183,6 +183,7 @@
<select id="receiptPaymentHistoryListPage" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
SELECT
+ T1.id,
T1.receipt_payment_date,
T5.customer_name,
T1.receipt_payment_amount,
--
Gitblit v1.9.3