From 3fd5bd656683c482141b13cfdb953d17ba377f1f Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 07 十一月 2025 09:50:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into hckx
---
src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
index 9cdc5a3..8e8cf1c 100644
--- a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
+++ b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
@@ -151,20 +151,24 @@
<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
+ 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},'%')
@@ -175,6 +179,9 @@
<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>
--
Gitblit v1.9.3