From 9056297c0384f7ab6470d70abba887fe4883b0c0 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 5 Sep 2023 10:07:14 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E5=87=BA=E5=8F=A3=E8=BD=AC=E5=86=85?=
 =?UTF-8?q?=E9=94=80=E7=BC=B4=E6=AC=BE=E4=B9=A6=E8=AE=A4=E8=AF=81=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/dxhy/core/model/BbycfpcxRespVO.java  |  1 +
 .../java/com/dxhy/core/model/ExportCustomsRzcxVO.java  |  2 +-
 dxhy-core/src/main/resources/mapper/BbycfpcxMapper.xml | 10 +++++++++-
 .../src/main/resources/mapper/TDxExportCustomsDao.xml  |  2 +-
 .../java/com/dxhy/extend/model/ExtBbycfpcxRespVO.java  |  1 +
 .../src/main/resources/mapper/ExtBbycfpcxMapper.xml    |  8 ++++++++
 6 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/BbycfpcxRespVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/BbycfpcxRespVO.java
index 7a9d047d..18ab2a74 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/model/BbycfpcxRespVO.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/model/BbycfpcxRespVO.java
@@ -99,6 +99,7 @@ public class BbycfpcxRespVO implements Serializable {
     private String bzdh;
     private String bzr;
     private String imageNumber;
+    private String compCode;
     private String snVoucherNumber;
     private String accountPeriod;
     private String postingTime;
diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/ExportCustomsRzcxVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/ExportCustomsRzcxVO.java
index d4fe5470..c11f08b6 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/model/ExportCustomsRzcxVO.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/model/ExportCustomsRzcxVO.java
@@ -35,7 +35,7 @@ public class ExportCustomsRzcxVO {
 
     private String snVoucherNumber;
     private String postingTime;
-    private String imageId;
+    private String imageNumber;
     private String accountPeriod;
     private String compCode;
     private String inAccountStatus;
diff --git a/dxhy-core/src/main/resources/mapper/BbycfpcxMapper.xml b/dxhy-core/src/main/resources/mapper/BbycfpcxMapper.xml
index 44983086..32ef922d 100644
--- a/dxhy-core/src/main/resources/mapper/BbycfpcxMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/BbycfpcxMapper.xml
@@ -28,6 +28,14 @@
         <result column="qsrq" property="qsrq"/>
         <result column="qsr" property="qsr"/>
         <result column="dept_name" property="businessName"/>
+        <result column="sn_voucher_number" property="snVoucherNumber"/>
+        <result column="account_period" property="accountPeriod"/>
+        <result column="posting_time" property="postingTime"/>
+        <result column="image_id" property="imageNumber"/>
+        <result column="comp_code" property="compCode"/>
+        <result column="image_id" property="imageNumber"/>
+        <result column="bzdh" property="bzdh"/>
+        <result column="bzr" property="bzr"/>
     </resultMap>
 
     <resultMap id="BbycfpcxhjResultMap"
@@ -45,7 +53,7 @@
         t.xf_tax_no xfsh,t.xf_name xfmc,t.tax_amount se,t.invoice_amount je,DATE_FORMAT(t.qs_date,'%Y-%m-%d') qsrq,
         t.qs_status qszt,t.qs_name qsr, t.invoice_status yczt,DATE_FORMAT(t.status_update_date,'%Y-%m-%d') ycsj ,
         DATE_FORMAT(t.rzh_date,'%Y-%m-%d') rzsj,t.rzh_yesorno rzzt,t.auth_status rzclzt,t.bdk_status
-        rzlx,t.rzh_belong_date skssq,dept_name
+        rzlx,t.rzh_belong_date skssq,dept_name,t.sn_voucher_number,t.account_period,t.posting_time,t.image_id,t.comp_code,t.bzdh,t.bzr
         from t_dx_record_invoice t
         WHERE t.invoice_status != '0'
         and t.invoice_type in ('01','03','08','14','31')
diff --git a/dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml b/dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml
index 9c0a6788..452be47f 100644
--- a/dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml
+++ b/dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml
@@ -174,7 +174,7 @@
         p.cxrz_status as cxrzStatus,
         p.sn_voucher_number as snVoucherNumber,
         p.posting_time as postingTime,
-        p.image_id as imageId,
+        p.image_id as imageNumber,
         p.account_period as account_period,
         p.bzdh,
         p.bzr,
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbycfpcxRespVO.java b/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbycfpcxRespVO.java
index 1da336e6..b7eab9f4 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbycfpcxRespVO.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbycfpcxRespVO.java
@@ -114,6 +114,7 @@ public class ExtBbycfpcxRespVO implements Serializable {
     private String imageNumber;
     private String accountPeriod;
     private String postingTime;
+    private String compCode;
     private String bzr;
 
     public ExtBbycfpcxRespVO() {}
diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml
index 73e34b7f..b0349a1d 100644
--- a/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml
@@ -33,6 +33,14 @@
         <result column="rzlx" property="rzlx"/>
         <result column="skssq" property="skssq"/>
         <result column="dept_name" property="businessName"/>
+        <result column="sn_voucher_number" property="snVoucherNumber"/>
+        <result column="account_period" property="accountPeriod"/>
+        <result column="posting_time" property="postingTime"/>
+        <result column="image_id" property="imageNumber"/>
+        <result column="comp_code" property="compCode"/>
+        <result column="image_id" property="imageNumber"/>
+        <result column="bzdh" property="bzdh"/>
+        <result column="bzr" property="bzr"/>
     </resultMap>
 
     <resultMap id="BbycfpcxhjResultMap"