diff --git a/dxhy-core/src/main/resources/mapper/BbycfpbbcxMapper.xml b/dxhy-core/src/main/resources/mapper/BbycfpbbcxMapper.xml index d7e5954b..306b8229 100644 --- a/dxhy-core/src/main/resources/mapper/BbycfpbbcxMapper.xml +++ b/dxhy-core/src/main/resources/mapper/BbycfpbbcxMapper.xml @@ -49,7 +49,7 @@ select t.invoice_status yczt,o.taxno gfsh,o.taxname gfmc,count(1) hjsl,sum(t.invoice_amount)hjje,sum(t.tax_amount)hjse - from ${dxhyTertiary}.t_dx_record_invoice t left join ${dxhyAdmin}.sys_dept o on t.gf_tax_no = o.taxno + from ${dxhyTertiary}.t_dx_record_invoice t where t.invoice_status != '0' and t.invoice_type in ('01','03','08','14') and to_char(t.invoice_date,'yyyy-mm-dd') between #{kpksrq} and #{kpjsrq} @@ -68,7 +68,7 @@ and t.company = #{company} - group by t.invoice_status,o.taxno,o.taxname + group by t.invoice_status,t.gf_tax_no,t.gf_name select invoice_code invoiceCode, invoice_no invoiceNo, qs_type qsType, qs_status qsStatus, qs_date qsDate from t_dx_invoice d - LEFT JOIN ${dxhyAdmin}.sys_user u on d.user_account = u.user_id - where u.push_yesorno = 1 - and d.uuid = #{uuid} + where d.uuid = #{uuid} diff --git a/dxhy-erp/src/main/resources/mapper/SignedDao.xml b/dxhy-erp/src/main/resources/mapper/SignedDao.xml index 6edf428a..41b5e030 100644 --- a/dxhy-erp/src/main/resources/mapper/SignedDao.xml +++ b/dxhy-erp/src/main/resources/mapper/SignedDao.xml @@ -29,17 +29,14 @@ d.create_date from t_dx_record_invoice ri left join t_dx_invoice d on d.uuid = ri.uuid - LEFT JOIN ${dxhyAdmin}.sys_user u on d.user_account = u.user_id - where u.push_yesorno = '1' - and ri.qs_status = '1' + where ri.qs_status = '1' and = #{startDate}]]> and and ri.gf_tax_no = #{gfTaxNo} diff --git a/dxhy-export-domestic/src/main/resources/mapper/DomesticRecordInvoiceMapper.xml b/dxhy-export-domestic/src/main/resources/mapper/DomesticRecordInvoiceMapper.xml index 266a8842..5aded362 100644 --- a/dxhy-export-domestic/src/main/resources/mapper/DomesticRecordInvoiceMapper.xml +++ b/dxhy-export-domestic/src/main/resources/mapper/DomesticRecordInvoiceMapper.xml @@ -1628,7 +1628,6 @@ ,t.sn_voucher_number,t.posting_time,t.image_id,t.account_period,t.bzdh,t.bzr,t.inaccount_status,t.comp_code from t_dx_record_invoice t - left join ${dxhyAdmin}.sys_business b on t.dept_id = b.business_code WHERE date_format(t.invoice_date,'%Y-%m-%d') between #{invoiceStartTime} and #{invoiceEndTime} and t.gf_tax_no = #{gfsh} and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null) @@ -1677,7 +1676,6 @@ ,t.sn_voucher_number,t.posting_time,t.image_id,t.account_period,t.bzdh,t.bzr,t.inaccount_status,t.comp_code from t_dx_record_invoice t - left join ${dxhyAdmin}.sys_business b on t.dept_id = b.business_code WHERE date_format(t.invoice_date,'%Y-%m-%d') between #{invoiceStartTime} and #{invoiceEndTime} and t.gf_tax_no = #{gfsh} and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null) @@ -1867,7 +1865,6 @@ select from t_dx_record_invoice t - left join ${dxhyAdmin}.sys_business b on t.dept_id = b.business_code WHERE TO_CHAR(t.invoice_date,'yyyy-MM-dd') between #{invoiceStartTime} and #{invoiceEndTime} and t.rzh_yesorno = '0' and t.auth_status in('0','5','6') @@ -1924,7 +1921,6 @@ select from t_dx_record_invoice t - left join ${dxhyAdmin}.sys_business b on t.dept_id = b.business_code WHERE TO_CHAR(t.invoice_date,'yyyy-MM-dd') between #{invoiceStartTime} and #{invoiceEndTime} and (t.rzlx = '2' or t.rzlx = '3') and t.export_mark = '0' diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbycfpbbcxMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbycfpbbcxMapper.xml index 030ed506..44a89a10 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtBbycfpbbcxMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtBbycfpbbcxMapper.xml @@ -48,8 +48,7 @@ select t.invoice_status yczt,o.taxno gfsh,o.taxname gfmc,count(1) hjsl,sum(t.invoice_amount)hjje,sum(t.tax_amount)hjse - from ${dxhyTertiary}.t_dx_record_invoice t left join ${dxhyAdmin}.sys_dept o on t.gf_tax_no = - o.taxno + from ${dxhyTertiary}.t_dx_record_invoice t where t.invoice_status != '0' and t.invoice_type in ('01','03','08','14') and t.company = #{company} @@ -67,7 +66,7 @@ - group by t.invoice_status,o.taxno,o.taxname + group by t.invoice_status,t.gf_tax_no,t.gf_name SELECT * FROM t_dx_invoice d - LEFT JOIN ${dxhyAdmin}.sys_user u on d.user_account = u.user_id - where u.push_yesorno = 1 - AND d.qs_status = 1 + where d.qs_status = 1 and d.uuid = #{uuid} diff --git a/dxhy-sign/src/main/resources/mapper/SignRecordInvoiceMapper.xml b/dxhy-sign/src/main/resources/mapper/SignRecordInvoiceMapper.xml index 10456f53..817ef2ff 100644 --- a/dxhy-sign/src/main/resources/mapper/SignRecordInvoiceMapper.xml +++ b/dxhy-sign/src/main/resources/mapper/SignRecordInvoiceMapper.xml @@ -239,9 +239,7 @@ invoiceDate,t.invoice_code,t.invoice_no,t.gf_name,t.xf_name,truncate(t.invoice_amount,2) as invoiceAmount,truncate(t.tax_amount,2) as taxAmount,DATE_FORMAT(t.qs_date,'%Y-%m-%d %T') as qsDate,t.uuid from t_dx_record_invoice t left join t_dx_invoice d on d.uuid = t.uuid - LEFT JOIN ${dxhyAdmin}.sys_user u on d.user_account = u.user_id - where u.push_yesorno=1 - and t.company = 'YL' and t.gf_tax_no in + where t.company = 'YL' and t.gf_tax_no in #{item} @@ -257,9 +255,7 @@ resultMap="WqshjResultMap" databaseId="mysql"> select count(1) hjsl,sum(t.invoice_amount)hjje,sum(t.tax_amount)hjse from t_dx_record_invoice t left join t_dx_invoice d on d.uuid = t.uuid - LEFT JOIN ${dxhyAdmin}.sys_user u on d.user_account = u.user_id - where u.push_yesorno=1 - and t.company = 'YL' and t.gf_tax_no in + where t.company = 'YL' and t.gf_tax_no in #{item}