From 29a9508cc537e09c90c9f4108e749682d65cb8be Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Tue, 6 Jun 2023 09:13:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B8=80=E9=94=AE=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E7=9A=84data=E2=80=94=E2=80=94format?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/controller/BaseRzTDxRecordInvoiceController.java | 7 +++++++ .../BaseRzTDxRecordInvoiceServiceImpl.java | 6 ++++++ dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml | 6 +++--- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseRzTDxRecordInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseRzTDxRecordInvoiceController.java index 805402fe..eef0a688 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseRzTDxRecordInvoiceController.java +++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseRzTDxRecordInvoiceController.java @@ -446,6 +446,13 @@ public class BaseRzTDxRecordInvoiceController extends AbstractController { } else { return ResponseEntity.ok(R.error("购方信息不能为空！")); } + if (StringHelper.isNotBlank(companyCode) && "99".equals(companyCode)){ + pramsMap.put("companyCodes",getUserInfo().getCompanyCodes()); + log.info("组织机构====>{}",pramsMap.get("companyCodes")); + } + if (org.apache.commons.lang3.StringUtils.isNotBlank(companyCode)){ + pramsMap.put("companyCode",companyCode); + } String invoiceSource = (String)map.get("invoiceSource"); if (!StringUtils.isBlank(invoiceSource) && !"99".equals(invoiceSource)) { pramsMap.put("invoiceSource", invoiceSource); diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java index f1409934..5934a0b2 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java @@ -7,6 +7,7 @@ import java.util.*; import javax.annotation.Resource; import cn.hutool.core.codec.Base64; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -46,6 +47,7 @@ import com.dxhy.common.vo.InvoiceLog; @SuppressWarnings({"AlibabaUndefineMagicConstant", "AlibabaMethodTooLong", "AlibabaLowerCamelCaseVariableNaming", "AlibabaClassNamingShouldBeCamel", "AlibabaCollectionInitShouldAssignCapacity"}) @Service("baseIRzTDxRecordInvoiceService") +@Slf4j public class BaseRzTDxRecordInvoiceServiceImpl extends MpBaseServiceImpl implements BaseIRzTDxRecordInvoiceService { @@ -401,6 +403,8 @@ public class BaseRzTDxRecordInvoiceServiceImpl extends MpBaseServiceImpl pramsMap) { + log.info("一键认证查询总数入参{}",pramsMap); + String hjsl = "0"; String hjje = "0"; String hjse = "0"; @@ -450,6 +454,8 @@ public class BaseRzTDxRecordInvoiceServiceImpl extends MpBaseServiceImpl pramsMap) { + log.info("一键认证入参{}",pramsMap); + String rzts = "0"; String hjje = "0"; String hjse = "0"; diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml index 9fc66af3..f6566d8b 100644 --- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml @@ -1022,7 +1022,7 @@ ,t.qs_type,t.qs_status,t.dk_tax_amount,t.qs_name 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.invoice_status in ('0','7') @@ -1254,7 +1254,7 @@ select count(1) hjsl,sum(t.invoice_amount)hjje,sum(t.dk_tax_amount)hjse 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.invoice_status in ('0','7') @@ -1263,7 +1263,7 @@ and t.invoice_amount>0 and t.tax_amount>=0 and d.tj_status in('0','3') - and date_format(t.invoice_date,'%Y%m%d') between c.select_start_date and c.select_end_date + and t.invoice_date between c.select_start_date and c.select_end_date and t.company = #{company} and t.gf_tax_no in