From e05dda1a9eb5957d2bc3bb72f7c2935214e25450 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Wed, 6 Sep 2023 18:04:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/resources/mapper/BaseFpZhMapper.xml | 19 ++------------
.../export/impl/RzFpxxServiceImpl.java | 4 +--
.../dxhy/core/thread/RzFpxxExportThread.java | 11 +-------
.../src/main/resources/mapper/FpZhMapper.xml | 26 +++----------------
4 files changed, 8 insertions(+), 52 deletions(-)
diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
index 08816b38..cb95acee 100644
--- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
@@ -80,22 +80,7 @@
and t.auth_status in ('2','3','4')
and t.company = #{company}
and t.gf_tax_no = #{gfsh}
-
-
- and (t.comp_code in
-
- #{companyCode}
-
- or t.comp_code is null or t.comp_code = ''
- )
-
-
- and t.comp_code = #{companyCode}
-
-
- and (t.comp_code = '' or t.comp_code is null)
-
-
+ and t.comp_code = #{companyCode}
and t.invoice_status = #{invoiceStatus}
@@ -367,7 +352,7 @@
from t_dx_record_invoice t
WHERE t.invoice_date between #{kpksrq} and #{kpjsrq}
and t.gf_tax_no = #{gfsh}
- and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
+ and t.comp_code = #{companyCode}
and t.invoice_type in('01','03','08','14','31','283','161','183','185')
and t.auth_status in ('2','3','4')
and t.bdk_status in ('1','2')
diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java
index ada59470..ac2e5e31 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java
@@ -239,9 +239,9 @@ public class RzFpxxServiceImpl extends MpBaseServiceImpl
DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ);
JSONObject json = new JSONObject();
try {
- List gfshList = (List)pramsMap.get("gfsh");
+ String gfsh = (String) pramsMap.get("gfsh");
String inAccountStatus = (String)pramsMap.get("inAccountStatus");
- if (gfshList.size() == 0) {
+ if (StringUtils.isNotBlank(gfsh)) {
// 未从getUserInfo()获取到购方税号信息
json.put("hjsl", "0");
json.put("hjje", "0");
diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java
index 6a669431..fe4fc494 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java
@@ -180,16 +180,6 @@ public class RzFpxxExportThread extends BaseThread {
pramsMap.put("taxRate", taxRate);
pramsMap.put("companyCodes",companyCodes);
- if (StringHelper.isBlank(gfsh)){
- pramsMap.put("sign","88");
- }
- List gfshList = new ArrayList<>();
- if (!StringHelper.isBlank(gfsh)) {
- gfshList = StringHelper.stringToList(gfsh);
- pramsMap.put("gfsh", gfshList);
- } else {
- pramsMap.put("gfsh", gfshList);
- }
// pramsMap.put("kpksrq", DateUtils.getMorning(DateUtils.strToDate(kpksrq)));
pramsMap.put("kpksrq", kpksrq);
// pramsMap.put("kpjsrq", DateUtils.getNight(DateUtils.strToDate(kpjsrq)));
@@ -269,6 +259,7 @@ public class RzFpxxExportThread extends BaseThread {
}
}
pramsMap.put("companyCode",companyCode);
+ pramsMap.put("gfsh",gfsh);
pramsMap.put("inAccountStatus", inAccountStatus);
pramsMap.put("company", company);
pramsMap.put("qsr", prams.getString("qsr"));
diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
index 0c566fe5..22646925 100644
--- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
@@ -105,33 +105,13 @@
t.export_mark,t.inaccount_status,t.payment_status,DATE_FORMAT(t.payment_date,'%Y-%m-%d')payment_date,t.voucher_number,t.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'))
+ and t.invoice_type in ('01','03','08','14','31','283','161','183','185')
and t.bdk_status in ('1','2')
and t.export_mark = '0'
and t.auth_status in ('2','3','4')
and t.company = #{company}
-
- and t.gf_tax_no in
-
- #{item}
-
-
-
-
- and (t.comp_code in
-
- #{companyCode}
-
- or t.comp_code is null or t.comp_code = ''
- )
-
-
-
- and t.comp_code = #{companyCode}
-
-
- and (t.comp_code = '' or t.comp_code is null)
-
+ and t.gf_tax_no = #{gfsh}
+ and t.comp_code = #{companyCode}
and t.invoice_status = #{invoiceStatus}