From abbbdeb0553eb5b76fb4b6acd9ff0da5ae7f5e9c Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Mon, 5 Jun 2023 14:49:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=9F=A5=E8=AF=A2=E3=80=81?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2=E4=BC=98?= =?UTF-8?q?=E5=8C=96date=5Fformat=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml | 4 ++-- dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml | 3 ++- dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml index 714c6539..18b4e39f 100644 --- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml @@ -73,7 +73,7 @@ bdk_date,t.rzh_back_msg,t.in_account_status,t.payment_status,date_format(t.payment_date,'%Y-%m-%d')payment_date, voucher_number,t.ele_invoice_no, sn_voucher_number, account_period, posting_time ,image_id from t_dx_record_invoice t - 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.bdk_status in ('1','2') and t.export_mark = '0' @@ -353,7 +353,7 @@ resultMap="RzcxhjResultMap" databaseId="mysql"> select count(1) hjsl,sum(t.invoice_amount)hjje,sum(t.tax_amount)hjse from t_dx_record_invoice t - 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.auth_status != '0' and t.bdk_status in ('1','2') diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml index 10146aa9..7cdc8932 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml @@ -69,7 +69,8 @@ t.settlement_no,t.inaccount_status,t.bzdh, t.settlement_status,t.voucher_number,t.total_amount,t.sn_voucher_number,t.posting_time,t.image_id,t.account_period from t_dx_record_invoice t - WHERE t.company = #{company} and t.invoice_date between #{kpksrq} and #{kpjsrq} + WHERE t.company = #{company} + and t.invoice_date between #{kpksrq} and #{kpjsrq} and t.gf_tax_no in diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml index 3915015b..60b6c659 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml @@ -182,7 +182,7 @@ where t.invoice_status != '0' and t.invoice_type in ('01','03','08','14','31') and t.company = #{company} - and DATE_FORMAT(t.invoice_date,'%Y-%m-%d') between #{kpksrq} and #{kpjsrq} + and t.invoice_date between #{kpksrq} and #{kpjsrq} and t.gf_tax_no in #{item}