From 97857de7bc536e459f8d5de78494c03cebc3171e Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 19 六月 2025 11:37:12 +0800
Subject: [PATCH] 2025-06-19修改

---
 src/main/resources/mapper/sales/ReceiptPaymentMapper.xml |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
index a73f338..b7ae6a2 100644
--- a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
+++ b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
@@ -64,6 +64,7 @@
             T1.id                ,
             T1.invoice_no        ,
             T1.invoice_total    ,
+            T3.project_name,
             T1.invoice_person    ,
             T1.invoice_date      ,
             T1.create_time       ,
@@ -172,7 +173,8 @@
         T1.receipt_payment_amount,
         T1.receipt_payment_type,
         T1.registrant,
-        T1.create_time
+        T1.create_time,
+        T4.project_name
         FROM
         receipt_payment T1
         LEFT JOIN
@@ -185,10 +187,10 @@
                 T5.customer_name LIKE CONCAT('%',#{params.searchText},'%')
             </if>
             <if test="params.receiptPaymentDateStart != null and params.receiptPaymentDateStart != '' ">
-                AND T1.receipt_payment_date &gt;= STR_TO_DATE(#{params.receiptPaymentDateStart},'yyyy-mm-dd')
+                AND T1.receipt_payment_date &gt;= date_format(#{params.receiptPaymentDateStart},'%Y-%m-%d')
             </if>
             <if test="params.receiptPaymentDateEnd != null and params.receiptPaymentDateEnd != '' ">
-                AND T1.receipt_payment_date &lt; STR_TO_DATE(#{params.receiptPaymentDateEnd}, '%Y-%m-%d')
+                AND T1.receipt_payment_date &lt; date_format(#{params.receiptPaymentDateEnd}, '%Y-%m-%d')
             </if>
         </where>
         ORDER BY T1.receipt_payment_date DESC

--
Gitblit v1.9.3