From d3dd0b2efe01f38e17cb9a53d24d839c8fd56e55 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Thu, 18 May 2023 15:34:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B5=B7=E5=85=B3=E7=BC=B4?=
 =?UTF-8?q?=E6=AC=BE=E4=B9=A6=E5=AD=97=E6=AE=B5=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dxhy/core/service/export/impl/CustomsServiceImpl.java  | 4 ++--
 .../main/java/com/dxhy/extend/entity/JkszhcxRespVO.java    | 1 +
 .../dxhy/extend/service/customs/CustomsServiceImpl.java    | 4 ++--
 dxhy-extend/src/main/resources/mapper/CustomsMapper.xml    | 7 +++----
 4 files changed, 8 insertions(+), 8 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 d8a60851..062e0ed2 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
@@ -131,8 +131,8 @@ public class CustomsServiceImpl extends MpBaseServiceImpl<CustomsDao, JkszhcxRes
                     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[29] = vo.getAccountPeriod();
+                    dataArray[28] = vo.getImageId();
                     dataArray[30] = vo.getBzdh();
                     if (vo.getInAccountStatus() != null && "1".equals(vo.getInAccountStatus())){
                         dataArray[31] = "已入账";
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/entity/JkszhcxRespVO.java b/dxhy-extend/src/main/java/com/dxhy/extend/entity/JkszhcxRespVO.java
index 08c888c9..32816de1 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/entity/JkszhcxRespVO.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/entity/JkszhcxRespVO.java
@@ -196,4 +196,5 @@ public class JkszhcxRespVO {
     private String filePath;
     private String businessName;
     private String compCode;
+    private String bzdh;
 }
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/customs/CustomsServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/customs/CustomsServiceImpl.java
index 132cc1db..82a2f21b 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/service/customs/CustomsServiceImpl.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/customs/CustomsServiceImpl.java
@@ -44,11 +44,11 @@ public class CustomsServiceImpl extends MpBaseServiceImpl<CustomsDao, CustomsRec
         // 表头
         String[] titlelist = {"序号", "缴款书号码", "管理状态", "填发日期", "缴款单位名称", "缴款单位税号", "税款金额", "抵扣税款金额", "稽核结果", "是否申请核对",
             "核对结果", "认证状态", "认证类型", "认证日期", "认证方式", "认证人", "采集状态", "底账库采集时间", "采集来源", "签收方式", "签收状态", "签收日期", "签收人",
-            "入账月份", "入账状态", "凭证号", "业务单元", "入池时间", "过账时间", "影像号", "账期","所属组织"};
+            "入账月份", "入账状态", "凭证号", "业务单元", "入池时间", "过账时间","报账单号", "影像号", "账期","所属组织"};
         String[] titleprop = {"xh", "customsCode", "glzt", "fillInDate", "gfName", "gfTaxNo", "taxAmount",
             "yxTaxAmount", "auditStatus", "applyCheck", "checkStatus", "rzhYesorno", "bdkStatus", "rzhDate", "rzhType",
             "confirmUser", "cjzt", "createDate", "dataSources", "qsType", "qsStatus", "qsDate", "qsUser",
-            "inAccountDate", "inAccountStatus", "voucherNumber", "businessName", "createDate", "postingTime","imageId",
+            "inAccountDate", "inAccountStatus", "snVoucherNumber", "businessName", "createDate", "postingTime","bzdh","imageId",
                 "accountPeriod","compCode"};
         // 需要设置返回列表标题时调用
         JSONObject json = super.setTitleList(titlelist, titleprop);
diff --git a/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml b/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml
index c6b36c0d..d5f95706 100644
--- a/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml
@@ -27,14 +27,13 @@
         <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="voucher_number" property="voucherNumber"/>
         <result column="document_number" property="documentNumber"/>
         <result column="sn_voucher_number" property="snVoucherNumber"/>
         <result column="posting_time" property="postingTime"/>
         <result column="image_id" property="imageId"/>
         <result column="account_period" property="accountPeriod"/>
+        <result column="bzdh" property="bzdh"/>
     </resultMap>
 
     <resultMap id="HjResultMap" type="java.util.Map">
@@ -49,8 +48,8 @@
         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.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.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,
+        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'
 <!--        and t.gf_tax_no in-->