diff --git a/dxhy-core/src/main/resources/mapper/BbfpzhMapper.xml b/dxhy-core/src/main/resources/mapper/BbfpzhMapper.xml index 3a91a151..f361cce6 100644 --- a/dxhy-core/src/main/resources/mapper/BbfpzhMapper.xml +++ b/dxhy-core/src/main/resources/mapper/BbfpzhMapper.xml @@ -76,9 +76,12 @@ and t.bzr like concat('%',#{bzr},'%') - + and t.inaccount_status = #{inAccountStatus} + + and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null) + and t.invoice_status = #{invoiceStatus} diff --git a/dxhy-core/src/main/resources/mapper/BbycfpcxMapper.xml b/dxhy-core/src/main/resources/mapper/BbycfpcxMapper.xml index e6957fc8..ef6ccf33 100644 --- a/dxhy-core/src/main/resources/mapper/BbycfpcxMapper.xml +++ b/dxhy-core/src/main/resources/mapper/BbycfpcxMapper.xml @@ -61,9 +61,12 @@ and t.bzr like concat('%',#{bzr},'%') - + and t.inaccount_status = #{inAccountStatus} + + and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null) + and t.sn_voucher_number = #{snVoucherNumber} diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml index 220c4702..43c32c20 100644 --- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml +++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml @@ -126,9 +126,12 @@ and t.bzr like concat('%',#{bzr},'%') - + and t.inaccount_status = #{inAccountStatus} + + and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null) + and t.qs_status = #{qszt} @@ -607,9 +610,12 @@ and t.suspend_date = #{suspendDate} - + and t.inaccount_status = #{inAccountStatus} + + and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null) + and date_format(t.qs_date,'%Y-%m-%d') between #{qsksrq} and #{qsjsrq}