From 4feb321e6fa88e86991da3610b2bdfcf5a2d87a7 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期三, 14 一月 2026 16:50:44 +0800
Subject: [PATCH] 新增字段

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

diff --git a/service/src/main/resources/mapper/cwgl/EstimatedReceivableMapper.xml b/service/src/main/resources/mapper/cwgl/EstimatedReceivableMapper.xml
index 709ed55..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>
@@ -191,6 +192,18 @@
         where id = #{item.id}
         </foreach>
     </update>
+    <update id="updateEstimatedReceivableBillStatus">
+        UPDATE estimated_receivable
+        SET related_bill_status = #{status}
+        <if test="billName !=null and billName != ''">
+            , related_bill_name = #{billName}
+        </if>
+
+        WHERE dispatch_no IN
+        <foreach item="item" collection="list" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </update>
 
     <!--鍒犻櫎-->
     <delete id="deleteEstimatedReceivableById" parameterType="Integer">

--
Gitblit v1.8.0