From ad76a462b4a5e4d49bba4f82506c7a5e09110a0f Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 23 May 2024 07:51:32 +0800
Subject: [PATCH] md

---
 .../main/resources/mapper/EmisWaybillMapper.xml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index d2eb1c572..2440dce74 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -292,7 +292,6 @@
         <include refid="selectEmisWaybillVo"/>
         <where>
             del_flag='0'
-
             <if test="id != null "> and id = #{id}</if>
             <if test="orderSn != null  and orderSn != ''"> and order_sn like concat('%', #{orderSn}, '%')</if>
             <if test="custOrderId != null  and custOrderId != ''"> and cust_order_id like concat('%', #{custOrderId}, '%')</if>
@@ -305,10 +304,6 @@
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="customerCode != null  and customerCode != ''"> and customer_code like concat('%', #{customerCode}, '%')</if>
             <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
-            <if test="receiveCustomerCode != null  and receiveCustomerCode != ''"> and receive_customer_code like concat('%', #{receiveCustomerCode}, '%')</if>
-            <if test="receiveCustomerName != null  and receiveCustomerName != ''"> and receive_customer_name like concat('%', #{receiveCustomerName}, '%')</if>
-            <if test="thirdCustomerCode != null  and thirdCustomerCode != ''"> and third_customer_code like concat('%', #{thirdCustomerCode}, '%')</if>
-            <if test="thirdCustomerName != null  and thirdCustomerName != ''"> and third_customer_name like concat('%', #{thirdCustomerName}, '%')</if>
             <if test="openId != null  and openId != ''"> and open_id like concat('%', #{openId}, '%')</if>
             <if test="receiveName != null  and receiveName != ''"> and receive_name like concat('%', #{receiveName}, '%')</if>
             <if test="receiveCompany != null  and receiveCompany != ''"> and receive_company like concat('%', #{receiveCompany}, '%')</if>
@@ -337,6 +332,7 @@
             <if test="paymentType != null  and paymentType != ''"> and payment_type like concat('%', #{paymentType}, '%')</if>
             <if test="calcFeeType != null  and calcFeeType != ''"> and calc_fee_type like concat('%', #{calcFeeType}, '%')</if>
             <if test="custNo != null  and custNo != ''"> and cust_no like concat('%', #{custNo}, '%')</if>
+            <if test="custName != null  and custName != ''"> and cust_name like concat('%', #{custName}, '%')</if>
             <if test="transLineType != null  and transLineType != ''"> and trans_line_type like concat('%', #{transLineType}, '%')</if>
             <if test="productType != null  and productType != ''"> and product_type like concat('%', #{productType}, '%')</if>
             <if test="timeType != null  and timeType != ''"> and time_type like concat('%', #{timeType}, '%')</if>
@@ -448,15 +444,20 @@
             <if test="billPicSendRmk != null  and billPicSendRmk != ''"> and bill_pic_send_rmk like concat('%', #{billPicSendRmk}, '%')</if>
             <if test="billPicDispatchRmk != null  and billPicDispatchRmk != ''"> and bill_pic_dispatch_rmk like concat('%', #{billPicDispatchRmk}, '%')</if>
             <if test="timezoneOffset != null  and timezoneOffset != ''"> and timezone_offset like concat('%', #{timezoneOffset}, '%')</if>
+            <if test="paymentStatus != null  and paymentStatus != ''"> and payment_status like concat('%', #{paymentStatus}, '%')</if>
+            <if test="paymentDate != null "> and payment_date = #{paymentDate}</if>
+            <if test="paymentRemark != null  and paymentRemark != ''"> and payment_remark like concat('%', #{paymentRemark}, '%')</if>
+            <if test="orderRemark != null  and orderRemark != ''"> and order_remark like concat('%', #{orderRemark}, '%')</if>
             <if test="dataFrom != null  and dataFrom != ''"> and data_from like concat('%', #{dataFrom}, '%')</if>
+            <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
             <if test="delFlag != null  and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
             <if test="createBy != null  and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
             <if test="createTime != null "> and create_time = #{createTime}</if>
             <if test="updateBy != null  and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
             <if test="updateTime != null "> and update_time = #{updateTime}</if>
-            <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
-            <if test="createSite != null  and createSite != ''"> and create_site=#{createSite}</if>
-            <if test="updateSite != null  and updateSite != ''"> and update_site=#{updateSite}</if>
+            <if test="createSite != null  and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
+            <if test="updateSite != null  and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
+
 
             <if test="params.beginSendDate != null and params.beginSendDate != ''">
                 and send_date <![CDATA[ >= ]]>  #{params.beginSendDate}