From 69eefc78e21955d0e2b8afdd8acf26d353cd2a08 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期一, 12 一月 2026 15:41:17 +0800
Subject: [PATCH] 修改发票新增
---
service/src/main/resources/mapper/cwgl/EstimatedReceivableMapper.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/service/src/main/resources/mapper/cwgl/EstimatedReceivableMapper.xml b/service/src/main/resources/mapper/cwgl/EstimatedReceivableMapper.xml
index 41b368e..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>
@@ -194,6 +195,10 @@
<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}
--
Gitblit v1.8.0