From 1fcaf7919db7ec3350e9bf953c0d651d4d85fac2 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 23 六月 2025 11:45:48 +0800
Subject: [PATCH] 2025-06-23 回款登记导出+分页查询条件问题修复+【采购管理】-【来票登记】，合同金额列后面增加已开票金额、待开票金额两列

---
 src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
index 61bbdfc..d245389 100644
--- a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
+++ b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
@@ -167,6 +167,12 @@
             <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;= date_format(#{params.paymentDateStart},'%Y-%m-%d')
+            </if>
+            <if test="params.paymentDateEnd != null and params.paymentDateEnd !='' ">
+                AND T1.payment_date &lt;= date_format(#{params.paymentDateEnd},'%Y-%m-%d')
+            </if>
         </where>
         ORDER BY T1.payment_date,T1.create_time DESC
     </select>

--
Gitblit v1.9.3