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 @@ and trans_line_type=#{transLineType} and product_type=#{productType} and time_type like concat('%', #{timeType}, '%') - and meter_type like concat('%', #{meterType}, '%') - and carry_type like concat('%', #{carryType}, '%') + and meter_type=#{meterType} + and FIND_IN_SET(carry_type,#{carryType}) and customs_clear=#{customsClear} and customs_eclaration=#{customsEclaration} and estimate_date = #{estimateDate} @@ -1195,7 +1195,7 @@ and sign_man like concat('%', #{signMan}, '%') and sign_man_code=#{signManCode} and sign_site_code=#{signSiteCode} - and payment_status =#{paymentStatus} + and FIND_IN_SET(payment_status,#{paymentStatus}) and payment_date = #{paymentDate} and payment_remark like concat('%', #{paymentRemark}, '%') and order_remark like concat('%', #{orderRemark}, '%')