From 5dc6be84f02788d98a67a7488e7fb2c8d4b08c04 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期一, 12 一月 2026 15:04:43 +0800
Subject: [PATCH] 修改发票新增

---
 service/src/main/resources/mapper/cwgl/EstimatedReceivableMapper.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/service/src/main/resources/mapper/cwgl/EstimatedReceivableMapper.xml b/service/src/main/resources/mapper/cwgl/EstimatedReceivableMapper.xml
index 3462f13..2a5e1c3 100644
--- a/service/src/main/resources/mapper/cwgl/EstimatedReceivableMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/EstimatedReceivableMapper.xml
@@ -40,7 +40,8 @@
         <if test="dispatchNo != null  and dispatchNo != ''"> and thisTab.dispatch_no = #{dispatchNo}</if>
         <if test="customerName != null  and customerName != ''"> and  thisTab.customer_name like concat('%', #{customerName}, '%')</if>
         <if test="projectName != null  and projectName != ''"> and  thisTab.project_name like concat('%', #{projectName}, '%')</if>
-        <if test="orderDate != null "> and thisTab.order_date = #{orderDate}</if>
+        <if test="orderDateBegin != null and orderDateBegin!='' and orderDateEnd != null and orderDateEnd!='' "> and thisTab.order_date between #{orderDateBegin} and #{orderDateEnd}</if>
+
         <if test="feeName != null  and feeName != ''"> and  thisTab.fee_name like concat('%', #{feeName}, '%')</if>
         <if test="estimatedAmount != null "> and thisTab.estimated_amount = #{estimatedAmount}</if>
         <if test="currency != null  and currency != ''"> and thisTab.currency = #{currency}</if>

--
Gitblit v1.8.0