diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml index 449fd3227..53b589b04 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml @@ -90,6 +90,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and site_confirm_man_code=#{siteConfirmManCode} and site_confirm_note like concat('%', #{siteConfirmNote}, '%') + + and a.send_site_code = #{params.sendSiteCode} + + + + and a.dispatch_underling_site_code = #{params.dispatchUnderlingSiteCode} + + + + and a.payee = #{params.payee} + + + + and a.salesmen = #{params.salesmen} + + + + + and a.salesmen = #{params.salesmen} + + + + and a.payment_type = #{params.paymentType} + + + and a.send_date = ]]> #{params.beginSendDate} @@ -116,7 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" UNION SELECT #{params.privSiteCode} FROM dual ) - or + or a.sign_site_code in ( SELECT t1.site_code FROM ( SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid := @@ -167,6 +193,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and site_confirm_man_code=#{siteConfirmManCode} and site_confirm_note like concat('%', #{siteConfirmNote}, '%') + + and a.send_site_code = #{params.sendSiteCode} + + + + and a.dispatch_underling_site_code = #{params.dispatchUnderlingSiteCode} + + + + and a.payee = #{params.payee} + + + + and a.salesmen = #{params.salesmen} + + + + + and a.salesmen = #{params.salesmen} + + + + and a.payment_type = #{params.paymentType} + + + and a.send_date = ]]> #{params.beginSendDate}