去掉一键认证的data——format

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);

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<BaseTDxRecordInvoiceDao, BaseTDxRecordInvoice>
     implements BaseIRzTDxRecordInvoiceService {
 
@@ -401,6 +403,8 @@ public class BaseRzTDxRecordInvoiceServiceImpl extends MpBaseServiceImpl<BaseTDx
     @Override
     public String identifiAllCount(Map<String, Object> pramsMap) {
 
+        log.info("一键认证查询总数入参{}",pramsMap);
+
         String hjsl = "0";
         String hjje = "0";
         String hjse = "0";
@@ -450,6 +454,8 @@ public class BaseRzTDxRecordInvoiceServiceImpl extends MpBaseServiceImpl<BaseTDx
     @Override
     public String identifiByAll(Map<String, Object> pramsMap) {
 
+        log.info("一键认证入参{}",pramsMap);
+
         String rzts = "0";
         String hjje = "0";
         String hjse = "0";

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
         <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">