diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml index 194e2588..4232ae31 100644 --- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml @@ -75,12 +75,14 @@ from t_dx_record_invoice t WHERE t.invoice_date between #{kpksrq} and #{kpjsrq} and t.invoice_type in('01','03','08','14','31','283','161','183','185') - and t.bdk_status in ('1','2') and t.export_mark = '0' and t.auth_status in ('0','2','3','4','5','6') and t.company = #{company} and t.gf_tax_no = #{gfsh} and t.comp_code = #{companyCode} + + and t.bdk_status in ('1','2') + and t.invoice_status = #{invoiceStatus} @@ -361,9 +363,11 @@ and t.comp_code = #{companyCode} and t.invoice_type in('01','03','08','14','31','283','161','183','185') and t.auth_status in ('0','2','3','4','5','6') - and t.bdk_status in ('1','2') and t.export_mark = '0' and t.company =#{company} + + and t.bdk_status in ('1','2') + and t.invoice_status = #{invoiceStatus} diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml index 5096e391..be2b498c 100644 --- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml +++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml @@ -106,13 +106,15 @@ from t_dx_record_invoice t WHERE t.invoice_date between #{kpksrq} and #{kpjsrq} and t.invoice_type in ('01','03','08','14','31','283','161','183','185') - and t.bdk_status in ('1','2') and t.export_mark = '0' and t.auth_status in ('0','2','3','4','5','6') and t.company = #{company} and t.gf_tax_no = #{gfsh} and t.comp_code = #{companyCode} + + and t.bdk_status in ('1','2') + and t.invoice_status = #{invoiceStatus}