diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml index 788d1866..f753a78a 100644 --- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml +++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml @@ -83,7 +83,7 @@ select t.invoice_code,t.invoice_no,t.invoice_type,DATE_FORMAT(t.invoice_date,'%Y-%m-%d')kprq,t.gf_tax_no gfsh,t.gf_name - gfmc,t.dept_id deptId,t.dept_name deptName,t.bzdh,t.inaccount_status inAccountStatus,t.comp_code compCode + gfmc,t.dept_id deptId,t.dept_name deptName, t.xf_tax_no,t.xf_name,t.tax_amount,t.dk_tax_amount,t.invoice_status,t.invoice_amount, date_format(t.rzh_date,'%Y-%m-%d') rzh_date,date_format(t.qs_date, '%Y-%m-%d') qs_date,t.rzh_type, @@ -100,12 +100,6 @@ #{item} - - and t.comp_code = #{companyCode} - - - and (t.comp_code = '' or t.comp_code is null) - and t.invoice_status = #{invoiceStatus}