diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml index 4ced888f..89d67651 100644 --- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml +++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml @@ -571,11 +571,12 @@ t.inaccount_status,t.payment_status,DATE_FORMAT(t.payment_date,'%Y-%m-%d')payment_date,t.settlement_no,t.ele_invoice_no from t_dx_record_invoice t left join t_dx_tax_current c on t.gf_tax_no = c.taxno left join t_dx_dk_count d on c.taxno = d.taxno and c.current_tax_period = d.skssq - WHERE date_format(t.invoice_date,'%Y-%m-%d') between #{kpksrq} and #{kpjsrq} + WHERE t.invoice_date between #{kpksrq} and #{kpjsrq} and (t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08')) 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') @@ -624,6 +625,9 @@ and t.bzdh = #{bzdh} + + and t.bzdh is not null + and t.bzr like concat('%',#{bzr},'%')