From c26cb905fc7579fa8df7a7195b6185d101c44fe5 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Thu, 18 May 2023 15:02:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=A4=9A=E4=BD=99=E5=92=8C=E5=AD=97=E6=AE=B5=E4=B8=8D?=
 =?UTF-8?q?=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../export/impl/CustomsServiceImpl.java       | 22 +++++++++----------
 .../export/impl/PoolPaperServiceImpl.java     | 20 ++++++++++++-----
 .../dxhy/core/thread/CustomExportThread.java  |  2 +-
 .../dxhy/core/thread/PoolAddTaxThread.java    |  2 +-
 .../com/dxhy/core/thread/PoolSaleThread.java  |  3 ++-
 .../main/resources/mapper/CustomsMapper.xml   |  5 ++---
 .../main/resources/mapper/ExtPaperMapper.xml  |  3 +++
 7 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsServiceImpl.java
index 5188cf72..d8a60851 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsServiceImpl.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsServiceImpl.java
@@ -124,22 +124,22 @@ public class CustomsServiceImpl extends MpBaseServiceImpl<CustomsDao, JkszhcxRes
 //                        dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS, vo.getInAccountStatus());
 
                     // 凭证号
-                    dataArray[24] = vo.getVoucherNumber();
+//                    dataArray[24] = vo.getVoucherNumber();
                     // 业务单元
-                    dataArray[25] = vo.getBusinessName();
+                    dataArray[24] = vo.getBusinessName();
                     // 入池时间
-                    dataArray[26] = vo.getCreateDate() == null ? "" : vo.getCreateDate().trim().substring(0, 11);
-                    dataArray[27] = vo.getSnVoucherNumber();
-                    dataArray[28] = vo.getPostingTime();
-                    dataArray[29] = vo.getAccountPeriod();
-                    dataArray[30] = vo.getImageId();
-                    dataArray[31] = vo.getBzdh();
+                    dataArray[25] = vo.getCreateDate() == null ? "" : vo.getCreateDate().trim().substring(0, 11);
+                    dataArray[26] = vo.getSnVoucherNumber();
+                    dataArray[27] = vo.getPostingTime();
+                    dataArray[28] = vo.getAccountPeriod();
+                    dataArray[29] = vo.getImageId();
+                    dataArray[30] = vo.getBzdh();
                     if (vo.getInAccountStatus() != null && "1".equals(vo.getInAccountStatus())){
-                        dataArray[32] = "已入账";
+                        dataArray[31] = "已入账";
                     }else {
-                        dataArray[32] = "未入账";
+                        dataArray[31] = "未入账";
                     }
-                    dataArray[33] = vo.getCompCode();
+                    dataArray[32] = vo.getCompCode();
                     returnList.add(dataArray);
                 }
             }
diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/PoolPaperServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/PoolPaperServiceImpl.java
index 17d55642..0dedc46d 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/PoolPaperServiceImpl.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/PoolPaperServiceImpl.java
@@ -7,6 +7,7 @@ import java.util.Map;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dxhy.common.util.StringHelper;
+import com.github.pagehelper.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
@@ -317,7 +318,11 @@ public class PoolPaperServiceImpl extends MpBaseServiceImpl<PoolPaperDao, Invoic
                     dataArray[29] = pageList.get(i).getCreateDate();
                     dataArray[30] = pageList.get(i).getSnVoucherNumber();
                     dataArray[31] = pageList.get(i).getPostingTime();
-                    dataArray[32] = pageList.get(i).getAccountPeriod();
+                    String accountPeriod = pageList.get(i).getAccountPeriod();
+                    if (StringUtil.isNotEmpty(accountPeriod) && accountPeriod.length() >7){
+                        accountPeriod = accountPeriod.substring(0,7);
+                    }
+                    dataArray[32] = accountPeriod;
                     dataArray[33] = pageList.get(i).getImageId();
                     dataArray[34] = pageList.get(i).getBzdh();
                     log.info("入账状态====>{}",pageList.get(i).getInAccountStatus());
@@ -358,7 +363,7 @@ public class PoolPaperServiceImpl extends MpBaseServiceImpl<PoolPaperDao, Invoic
             // 用于页面返回list对象
             if (pageList != null && pageList.size() > 0) {
                 for (int i = 0; i < pageList.size(); i++) {
-                    String[] dataArray = new String[30];
+                    String[] dataArray = new String[33];
                     dataArray[0] = String.valueOf((curr - 1) * size + i + 1);
                     // 发票类型
                     dataArray[1] = new InvoiceTypeUtils().invoiceTypeName(pageList.get(i).getInvoiceType());
@@ -415,13 +420,16 @@ public class PoolPaperServiceImpl extends MpBaseServiceImpl<PoolPaperDao, Invoic
                     dataArray[23] = pageList.get(i).getSnVoucherNumber();
                     dataArray[24] = pageList.get(i).getDocumentNumber();
                     dataArray[25] = pageList.get(i).getCreateDate();
-                    dataArray[26] = pageList.get(i).getBzdh();
+                    dataArray[26] = pageList.get(i).getImageId();
+                    dataArray[27] = pageList.get(i).getAccountPeriod();
+                    dataArray[28] = pageList.get(i).getPostingTime();
+                    dataArray[29] = pageList.get(i).getBzdh();
                     if ("1".equals(pageList.get(i).getInAccountStatus())) {
-                        dataArray[27] = "已入账";
+                        dataArray[30] = "已入账";
                     } else{
-                        dataArray[27] = "未入账";
+                        dataArray[30] = "未入账";
                     }
-                    dataArray[28] = pageList.get(i).getCompCode();
+                    dataArray[31] = pageList.get(i).getCompCode();
                     returnList.add(dataArray);
                 }
             }
diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/CustomExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/CustomExportThread.java
index 5a828e79..5565f7bd 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/thread/CustomExportThread.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/thread/CustomExportThread.java
@@ -64,7 +64,7 @@ public class CustomExportThread extends BaseThread {
 
     String[] titleColumns = {"序号", "缴款书号码", "管理状态", "填发日期", "缴款单位名称", "缴款单位税号", "税款金额", "抵扣税款金额", "稽核结果", "是否申请核对",
         "核对结果", "认证状态", "认证类型", "认证日期", "认证方式", "认证人", "采集状态", "底账库采集时间", "采集来源", "签收方式", "签收状态", "签收日期", "签收人", "入账月份",
-         "凭证号", "业务单元", "入池时间","凭证号", "过账时间", "影像号", "账期","报账单号","入账状态","所属组织"};
+          "业务单元", "入池时间","凭证号", "过账时间", "影像号", "账期","报账单号","入账状态","所属组织"};
 
     String[] titleprop = {"xh", "customsCode", "fillInDate", "gfTaxNo", "gfName", "taxAmount", "yxTaxAmount",
         "auditStatus", "applyCheck", "checkStatus", "rzhYesorno", "bdkStatus", "rzhDate", "rzhType", "confirmUser",
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 f0bc1cd5..aeee2e20 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
@@ -68,7 +68,7 @@ public class PoolAddTaxThread extends BaseThread {
      */
     private final String[] titleColumns = {"序号", "发票类型", "发票代码", "发票号码", "发票状态", "开票日期", "销方名称", "销方税号", "金额", "税额",
             "有效税额", "价税合计", "认证状态", "认证类型", "认证日期", "认证方式", "认证人", "采集状态", "底账库采集时间", "采集来源", "签收方式", "签收状态", "签收日期", "签收人",
-        "入账月份", "是否末次摊销", "摊销金额", "剩余金额", "业务单号", "入池时间","凭证号","过账时间","账期","影像id","报账单号","入账状态","所属组织"};
+        "入账月份", "是否末次摊销", "摊销金额", "剩余金额", "业务单号", "入池时间","凭证号","过账时间","账期","影像号","报账单号","入账状态","所属组织"};
 
     /**
      * 导出excel的列名
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 83b23eca..aab726a2 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
@@ -72,7 +72,8 @@ public class PoolSaleThread extends BaseThread {
      */
     private final String[] titleColumns =
         {"序号", "发票类型", "发票代码", "发票号码", "发票状态", "开票日期", "购方名称", "购方税号", "金额", "税额", "价税合计", "清单标志", "备注", "优惠政策类型",
-            "采集状态", "采集时间", "采集来源", "签收方式", "对接系统", "签收状态", "签收日期", "签收人", "入账月份", "凭证号", "业务单号", "入池时间","报账单号","入账状态","所属组织"};
+            "采集状态", "采集时间", "采集来源", "签收方式", "对接系统", "签收状态", "签收日期", "签收人", "入账月份", "凭证号", "业务单号",
+                "入池时间","影像号","账期","过账日期","报账单号","入账状态","所属组织"};
 
     /**
      * 导出excel的列名
diff --git a/dxhy-core/src/main/resources/mapper/CustomsMapper.xml b/dxhy-core/src/main/resources/mapper/CustomsMapper.xml
index 965eecba..a4e1af07 100644
--- a/dxhy-core/src/main/resources/mapper/CustomsMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/CustomsMapper.xml
@@ -29,11 +29,10 @@
         <result column="in_account_status" property="inAccountStatus"/>
         <result column="voucher_number" property="voucherNumber"/>
         <result column="document_number" property="documentNumber"/>
-        <result column="sn_voucher_number" property="snVoucherNumber"/>
+        <result column="snVoucherName" property="snVoucherNumber"/>
         <result column="posting_time" property="postingTime"/>
         <result column="image_id" property="imageId"/>
-        <result column="account_period" property="accountPeriod"/>
-        <result column="inaccount_status" property="inAccountStatus"/>
+        <result column="accountPeriod" property="accountPeriod"/>
         <result column="bzdh" property="bzdh"/>
         <result column="comp_code" property="compCode"/>
     </resultMap>
diff --git a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml
index f4e10428..3db2a63e 100644
--- a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml
@@ -7,6 +7,9 @@
         .
         invoice_code
         invoiceCode,
+        t.image_id imageId,
+        t.account_period accountPeriod,
+        t.posting_time postingTime,
 		t.invoice_no invoiceNo,
 		t.invoice_status invoiceStatus,
 		t.invoice_type invoiceType,