This commit is contained in:
linfso 2024-07-10 09:05:23 +08:00
parent a94cd60207
commit 9328d5109c

View File

@ -113,11 +113,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
<if test="params.mergeStatus != null and params.mergeStatus == 1">
and b.settle_bill_no is null
and b.bl_merge='0'
and b.bl_confirm_center='1'
and b.bl_confirm_site='1'
</if>
<if test="params.mergeStatus != null and params.mergeStatus == 2">
and b.settle_bill_no is not null
and b.bl_merge='1'
and b.bl_confirm_center='1'
and b.bl_confirm_site='1'
</if>
<if test="params.payee != null and params.payee != ''">
@ -129,10 +134,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
<if test="params.salesmen != null and params.salesmen != ''">
and a.salesmen = #{params.salesmen}
<if test="params.paymentType != null and params.paymentType != ''">
and a.payment_type = #{params.paymentType}
</if>
<if test="params.blSpecialQuote != null and params.blSpecialQuote != ''">
and a.bl_special_quote = #{params.blSpecialQuote}
</if>
@ -141,11 +147,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and a.calc_fee_type = #{params.calcFeeType}
</if>
<if test="params.paymentType != null and params.paymentType != ''">
and a.payment_type = #{params.paymentType}
</if>
<if test="params.beginSendDate != null and params.beginSendDate != ''">
and a.send_date <![CDATA[ >= ]]> #{params.beginSendDate}
</if>
@ -234,13 +235,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
<if test="params.mergeStatus != null and params.mergeStatus == 1">
and b.settle_bill_no is null
and b.bl_merge='0'
and b.bl_confirm_center='1'
and b.bl_confirm_site='1'
</if>
<if test="params.mergeStatus != null and params.mergeStatus == 2">
and b.settle_bill_no is not null
and b.bl_merge='1'
and b.bl_confirm_center='1'
and b.bl_confirm_site='1'
</if>
@ -254,10 +256,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
<if test="params.salesmen != null and params.salesmen != ''">
and a.salesmen = #{params.salesmen}
</if>
<if test="params.paymentType != null and params.paymentType != ''">
and a.payment_type = #{params.paymentType}
</if>