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 @@
del_flag='0'
-
and id = #{id}
and order_sn like concat('%', #{orderSn}, '%')
and cust_order_id like concat('%', #{custOrderId}, '%')
@@ -305,10 +304,6 @@
and user_id = #{userId}
and customer_code like concat('%', #{customerCode}, '%')
and customer_name like concat('%', #{customerName}, '%')
- and receive_customer_code like concat('%', #{receiveCustomerCode}, '%')
- and receive_customer_name like concat('%', #{receiveCustomerName}, '%')
- and third_customer_code like concat('%', #{thirdCustomerCode}, '%')
- and third_customer_name like concat('%', #{thirdCustomerName}, '%')
and open_id like concat('%', #{openId}, '%')
and receive_name like concat('%', #{receiveName}, '%')
and receive_company like concat('%', #{receiveCompany}, '%')
@@ -337,6 +332,7 @@
and payment_type like concat('%', #{paymentType}, '%')
and calc_fee_type like concat('%', #{calcFeeType}, '%')
and cust_no like concat('%', #{custNo}, '%')
+ and cust_name like concat('%', #{custName}, '%')
and trans_line_type like concat('%', #{transLineType}, '%')
and product_type like concat('%', #{productType}, '%')
and time_type like concat('%', #{timeType}, '%')
@@ -448,15 +444,20 @@
and bill_pic_send_rmk like concat('%', #{billPicSendRmk}, '%')
and bill_pic_dispatch_rmk like concat('%', #{billPicDispatchRmk}, '%')
and timezone_offset like concat('%', #{timezoneOffset}, '%')
+ and payment_status like concat('%', #{paymentStatus}, '%')
+ and payment_date = #{paymentDate}
+ and payment_remark like concat('%', #{paymentRemark}, '%')
+ and order_remark like concat('%', #{orderRemark}, '%')
and data_from like concat('%', #{dataFrom}, '%')
+ and remark like concat('%', #{remark}, '%')
and del_flag like concat('%', #{delFlag}, '%')
and create_by like concat('%', #{createBy}, '%')
and create_time = #{createTime}
and update_by like concat('%', #{updateBy}, '%')
and update_time = #{updateTime}
- and remark like concat('%', #{remark}, '%')
- and create_site=#{createSite}
- and update_site=#{updateSite}
+ and create_site like concat('%', #{createSite}, '%')
+ and update_site like concat('%', #{updateSite}, '%')
+
and send_date = ]]> #{params.beginSendDate}