From 05ae00ed8669e8c35dedd42112d259928389e698 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 13 Mar 2025 09:10:25 +0800
Subject: [PATCH] md

---
 .../src/main/resources/mapper/EmisCreditCustomerMapper.xml  | 2 +-
 emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisCreditCustomerMapper.xml b/emis-biz/src/main/resources/mapper/EmisCreditCustomerMapper.xml
index 665370ef0..391051107 100644
--- a/emis-biz/src/main/resources/mapper/EmisCreditCustomerMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCreditCustomerMapper.xml
@@ -120,7 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and a.bill_code=b.bill_code
             and settle_type='2'
             and not exists(
-                    select 1 from emis_waybill_problem_info ewpi where a.bill_code=ewpi.bill_code and ewpi.del_flag='0' and ewpi.`problem_type` in(173,170,151)
+                select 1 from emis_waybill_problem_info ewpi where a.bill_code=ewpi.bill_code and ewpi.del_flag='0' and ewpi.`problem_type` in(173,170,151)
             )
             and a.trans_line_type=c.line_code
             and a.cust_no=#{monthlyPayCode}
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 9e9886b01..a5943b119 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -1096,8 +1096,8 @@
             <if test="transLineType != null  and transLineType != ''"> and trans_line_type=#{transLineType}</if>
             <if test="productType != null  and productType != ''"> and product_type=#{productType}</if>
             <if test="timeType != null  and timeType != ''"> and time_type like concat('%', #{timeType}, '%')</if>
-            <if test="meterType != null  and meterType != ''"> and meter_type like concat('%', #{meterType}, '%')</if>
-            <if test="carryType != null  and carryType != ''"> and carry_type like concat('%', #{carryType}, '%')</if>
+            <if test="meterType != null  and meterType != ''"> and meter_type=#{meterType}</if>
+            <if test="carryType != null  and carryType != ''">and FIND_IN_SET(carry_type,#{carryType})</if>
             <if test="customsClear != null  and customsClear != ''"> and customs_clear=#{customsClear}</if>
             <if test="customsEclaration != null  and customsEclaration != ''"> and customs_eclaration=#{customsEclaration}</if>
             <if test="estimateDate != null "> and estimate_date = #{estimateDate}</if>
@@ -1195,7 +1195,7 @@
             <if test="signMan != null  and signMan != ''"> and sign_man like concat('%', #{signMan}, '%')</if>
             <if test="signManCode != null  and signManCode != ''"> and sign_man_code=#{signManCode}</if>
             <if test="signSiteCode != null  and signSiteCode != ''"> and sign_site_code=#{signSiteCode}</if>
-            <if test="paymentStatus != null  and paymentStatus != ''"> and payment_status =#{paymentStatus}</if>
+            <if test="paymentStatus != null  and paymentStatus != ''"> and FIND_IN_SET(payment_status,#{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>