修改海關繳款書

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)));
+                        if (StringUtils.isNotEmpty(gfshList.get(0))){
-                        ftpFileName.append(fileSplit);
+                            ftpFileName.append(poolPaperService.getblocName(gfshList.get(0)));
+                            ftpFileName.append(fileSplit);
+                        }
                     }
                 } else {
                     if (gfshList.size() > 0) {
                         for (String s : gfshList) {
-                            ftpFileName.append(poolPaperService.getGfName(s));
+                            if (StringUtils.isNotEmpty(s)){
-                            ftpFileName.append(fileSplit);
+                                ftpFileName.append(poolPaperService.getGfName(s));
+                                ftpFileName.append(fileSplit);
+                            }
                         }
                     }
                 }

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)));
+                        if (StringUtils.isNotEmpty(gfshList.get(0))){
-                        ftpFileName.append(fileSplit);
+                            ftpFileName.append(poolPaperService.getblocName(gfshList.get(0)));
+                            ftpFileName.append(fileSplit);
+                        }
                     }
                 } else {
                     if (gfshList.size() > 0) {
                         for (String s : gfshList) {
-                            ftpFileName.append(poolPaperService.getGfName(s));
+                            if (StringUtils.isNotEmpty(s)){
-                            ftpFileName.append(fileSplit);
+                                ftpFileName.append(poolPaperService.getGfName(s));
+                                ftpFileName.append(fileSplit);
+                            }
                         }
                     }
                 }

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)));
+                        if (StringUtils.isNotEmpty(gfshList.get(0))){
-                        ftpFileName.append(fileSplit);
+                            ftpFileName.append(ticketService.getblocName(gfshList.get(0)));
+                            ftpFileName.append(fileSplit);
+                        }
                     }
                 } else {
                     if (gfshList.size() > 0) {
                         for (String s : gfshList) {
-                            ftpFileName.append(ticketService.getGfName(s));
+                            if (StringUtils.isNotEmpty(s)){
-                            ftpFileName.append(fileSplit);
+                                ftpFileName.append(ticketService.getGfName(s));
+                                ftpFileName.append(fileSplit);
+                            }
                         }
                     }
                 }

dxhy-extend/src/main/resources/mapper/CustomsMapper.xml

@@ -27,7 +27,7 @@
         <result column="glzt" property="glzt"/>
         <result column="customs_scan_id" property="customsScanId"/>
         <result column="businessName" property="businessName"/>
-        <result column="in_account_status" property="inAccountStatus"/>
+        <result column="inaccount_status" property="inAccountStatus"/>
         <result column="document_number" property="documentNumber"/>
         <result column="sn_voucher_number" property="snVoucherNumber"/>
         <result column="posting_time" property="postingTime"/>
@@ -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'