From c722d5132e8d2e9adf4951d19174c07d3e784f4d Mon Sep 17 00:00:00 2001 From: yefei Date: Mon, 19 Jun 2023 11:31:14 +0800 Subject: [PATCH] =?UTF-8?q?arieay=20=E6=9F=A5=E8=AF=A2sql=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=A8=8E=E7=8E=87=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/base/controller/BaseInvoiceController.java | 4 ++-- dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml | 2 +- dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java index 8902f369..beeb0c26 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java +++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java @@ -141,7 +141,7 @@ public class BaseInvoiceController extends AbstractController { String businessCode = (String)map.get("businessCode"); String qsr = (String)map.get("qsr"); String rzhr = (String)map.get("rzhr"); - String taxRate = (String) map.get("taxRate"); + String taxRate = String.valueOf(map.get("taxRate")); String inAccountStatus = (String)map.get("inAccountStatus"); int curr = (int)map.get("curr"); int size = (int)map.get("size"); @@ -510,7 +510,7 @@ public class BaseInvoiceController extends AbstractController { String suspendStatus = (String) map.get("suspendStastus"); String suspendDate = (String) map.get("suspendDate"); String bzr = (String) map.get("bzr"); - String taxRate = (String) map.get("taxRate"); + String taxRate = String.valueOf(map.get("taxRate")); if (StringUtils.isNotEmpty(suspendDate) && suspendDate.length() >7){ suspendDate = suspendDate.substring(0,7); } diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml index 4ac582fe..312ac7bb 100644 --- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml @@ -71,7 +71,7 @@ t.rzh_belong_date as dqskssq,t.auth_status,t.qs_type,t.qs_status,t.confirm_user,t.qs_name,t.rzh_yesorno,t.cxrz_status,t.out_status, t.bdk_status,t.bdk_current_period,date_format(t.bdk_date,'%Y-%m-%d') 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 + voucher_number,t.ele_invoice_no, sn_voucher_number, account_period, posting_time ,image_id,tax_rate 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') or (t.invoice_type ='32' and t.lq_tdyslxDm='08')) diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml index 76712016..da24283d 100644 --- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml @@ -69,7 +69,7 @@ case date_format(t.invoice_date,'%Y%m%d') between c.select_start_date and c.select_end_date when true then 1 else 2 end authStatus,t.bzdh,t.suspend_status,t.suspend_date, - t.inaccount_status,t.payment_status,DATE_FORMAT(t.payment_date,'%Y-%m-%d')payment_date,t.settlement_no,t.ele_invoice_no + t.inaccount_status,t.payment_status,DATE_FORMAT(t.payment_date,'%Y-%m-%d')payment_date,t.settlement_no,t.ele_invoice_no,t.tax_rate 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 t.invoice_date between #{kpksrq} and #{kpjsrq}