diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml index f0c9db6b..c96b7c33 100644 --- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml @@ -77,6 +77,7 @@ and t.rzh_yesorno = '0' and t.auth_status in('0','5','6') and t.export_mark = '0' + and t.inaccount_status = '1' and t.company = #{company} and t.invoice_status in ('0','7') @@ -136,7 +137,7 @@ and t.bzdh = #{bzdh} - and t.bzdh is not null and t.inaccount_status = '1' + and t.bzdh is not null and t.inaccount_status = #{inAccountStatus} @@ -219,12 +220,6 @@ and t.account_period = #{accountPeriod} - - and t.tax_rate = #{taxRate} - - - and t.tax_rate like '%,%' - @@ -517,6 +512,9 @@ and t.bzdh = #{bzdh} + + and t.bzdh is not null + and t.inaccount_status = #{inAccountStatus} @@ -1414,12 +1412,12 @@ and t.ele_invoice_no = #{eleInvoiceNo} - + and t.tax_rate = #{taxRate} - - - + + and t.tax_rate like '%,%' +