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/purchase/PaymentRegistrationMapper.xml |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
index 88c8a85..44707d3 100644
--- a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
+++ b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
@@ -156,22 +156,27 @@
         T1.current_payment_amount,
         T1.payment_method,
         T3.nick_name AS registrant,
-        T1.registrationt_date
+        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.purchase_ledger_id = T1.purchase_ledger_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;= STR_TO_DATE(#{params.paymentDateStart},'yyyy-MM-dd')
+                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 &gt;= STR_TO_DATE(#{params.paymentDateEnd},'yyyy-MM-dd')
+                AND T1.payment_date &lt;= date_format(#{params.paymentDateEnd},'%Y-%m-%d')
             </if>
         </where>
         ORDER BY T1.payment_date,T1.create_time DESC

--
Gitblit v1.9.3