From 3a2c4608829808d0723d0e5dfb638bf4d1e7b33b Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Wed, 24 May 2023 15:17:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=B7=E9=97=9C=E7=B9=B3?=
=?UTF-8?q?=E6=AC=BE=E6=9B=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/dxhy/core/thread/PoolAddTaxThread.java | 13 +++++++++----
.../java/com/dxhy/core/thread/PoolSaleThread.java | 13 +++++++++----
.../com/dxhy/core/thread/QypcsmkpExportThread.java | 13 +++++++++----
.../src/main/resources/mapper/CustomsMapper.xml | 4 ++--
4 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java
index 8da04937..8084be48 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java
@@ -31,6 +31,7 @@ import com.dxhy.oss.service.FileService;
import cn.hutool.core.date.DateUtil;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
/**
* @author user
@@ -214,14 +215,18 @@ public class PoolAddTaxThread extends BaseThread {
ftpFileName.append(fileSplit);
if ("99".equals(gfTaxNo)) {
if (gfshList.size() > 0) {
- ftpFileName.append(poolPaperService.getblocName(gfshList.get(0)));
- ftpFileName.append(fileSplit);
+ if (StringUtils.isNotEmpty(gfshList.get(0))){
+ ftpFileName.append(poolPaperService.getblocName(gfshList.get(0)));
+ ftpFileName.append(fileSplit);
+ }
}
} else {
if (gfshList.size() > 0) {
for (String s : gfshList) {
- ftpFileName.append(poolPaperService.getGfName(s));
- ftpFileName.append(fileSplit);
+ if (StringUtils.isNotEmpty(s)){
+ ftpFileName.append(poolPaperService.getGfName(s));
+ ftpFileName.append(fileSplit);
+ }
}
}
}
diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java
index 0408d461..39cff42b 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java
@@ -31,6 +31,7 @@ import com.dxhy.oss.service.FileService;
import cn.hutool.core.date.DateUtil;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
/**
* 功能描述
@@ -213,14 +214,18 @@ public class PoolSaleThread extends BaseThread {
ftpFileName.append(fileSplit);
if ("99".equals(gfTaxNo)) {
if (gfshList.size() > 0) {
- ftpFileName.append(poolPaperService.getblocName(gfshList.get(0)));
- ftpFileName.append(fileSplit);
+ if (StringUtils.isNotEmpty(gfshList.get(0))){
+ ftpFileName.append(poolPaperService.getblocName(gfshList.get(0)));
+ ftpFileName.append(fileSplit);
+ }
}
} else {
if (gfshList.size() > 0) {
for (String s : gfshList) {
- ftpFileName.append(poolPaperService.getGfName(s));
- ftpFileName.append(fileSplit);
+ if (StringUtils.isNotEmpty(s)){
+ ftpFileName.append(poolPaperService.getGfName(s));
+ ftpFileName.append(fileSplit);
+ }
}
}
}
diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java
index 135feb8d..e790ee59 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java
@@ -22,6 +22,7 @@ import com.dxhy.oss.service.FileService;
import cn.hutool.core.date.DateUtil;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
/**
* 实名客票
@@ -134,14 +135,18 @@ public class QypcsmkpExportThread extends BaseThread {
ftpFileName.append(fileSplit);
if ("99".equals(gfTaxNo)) {
if (gfshList.size() > 0) {
- ftpFileName.append(ticketService.getblocName(gfshList.get(0)));
- ftpFileName.append(fileSplit);
+ if (StringUtils.isNotEmpty(gfshList.get(0))){
+ ftpFileName.append(ticketService.getblocName(gfshList.get(0)));
+ ftpFileName.append(fileSplit);
+ }
}
} else {
if (gfshList.size() > 0) {
for (String s : gfshList) {
- ftpFileName.append(ticketService.getGfName(s));
- ftpFileName.append(fileSplit);
+ if (StringUtils.isNotEmpty(s)){
+ ftpFileName.append(ticketService.getGfName(s));
+ ftpFileName.append(fileSplit);
+ }
}
}
}
diff --git a/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml b/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml
index d5f95706..8e391017 100644
--- a/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml
@@ -27,7 +27,7 @@
-
+
@@ -48,7 +48,7 @@
fill_in_date,t.gf_tax_no,t.gf_name,t.tax_amount,t.yx_tax_amount,t.audit_status,t.apply_check,t.check_status,t.qs_status,
DATE_FORMAT(t.qs_date,'%Y-%m-%d') qs_date,t.qs_type,t.qs_user,DATE_FORMAT(t.rzh_date,'%Y-%m-%d')
rzh_date, t.rzh_yesorno,t.auth_status,t.bdk_status,t.confirm_user,t.rzh_belong_date,t.glzt,
- t.customs_scan_id,t.dept_name businessName,t.in_account_status,t.sn_voucher_number,t.document_number,t.in_account_date,rzh_type,rzlx,t.create_date,
+ t.customs_scan_id,t.dept_name businessName,t.inaccount_status,t.sn_voucher_number,t.document_number,t.in_account_date,rzh_type,rzlx,t.create_date,
data_sources,t.image_id,t.posting_time,t.account_period,t.comp_code,t.bzdh
from t_dx_customs_record t
where export_mark = '0'