From 20422b802b646852af95879c254eea1444345bee Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Tue, 29 Aug 2023 20:07:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E7=BB=93=E6=9E=9C=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dxhy/core/model/RzjgqdRespVO.java     | 19 +++++++++++++++++++
 .../export/impl/RzjgqdServiceImpl.java        | 10 +++++++++-
 .../dxhy/core/thread/RzjgqdExportThread.java  |  3 ++-
 .../core/thread/RzjgqdPdfExportThread.java    |  3 ++-
 .../main/resources/mapper/RzjgqdMapper.xml    | 10 +++++++++-
 5 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/RzjgqdRespVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/RzjgqdRespVO.java
index 8272158d..d1bf2d79 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/model/RzjgqdRespVO.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/model/RzjgqdRespVO.java
@@ -83,4 +83,23 @@ public class RzjgqdRespVO implements Serializable {
      * 抵扣类型
      */
     private String dklx;
+
+    //凭证号
+    private String snVoucherNumber;
+    //账期
+    private String accountPeriod;
+    //过账时间
+    private String postingTime;
+    //影像号
+    private String imageNumber;
+    //报账单号
+    private String bzdh;
+    /**
+     * 组织编码
+     */
+    private String compCode;
+
+    private String bzr;
+
+    private String inAccountStatus;
 }
diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzjgqdServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzjgqdServiceImpl.java
index d89b1f91..cd0416ea 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzjgqdServiceImpl.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzjgqdServiceImpl.java
@@ -54,7 +54,7 @@ public class RzjgqdServiceImpl extends MpBaseServiceImpl<RzjgqdDao, RzjgqdRespVO
         if (resultList != null && resultList.size() > 0) {
             for (int i = 0; i < resultList.size(); i++) {
                 // 页面展示需要信息
-                String[] dataArray = new String[12];
+                String[] dataArray = new String[20];
                 dataArray[0] = String.valueOf((curr - 1) * size + i + 1);
                 dataArray[1] = resultList.get(i).getFpdm();
                 dataArray[2] = resultList.get(i).getFphm();
@@ -73,6 +73,14 @@ public class RzjgqdServiceImpl extends MpBaseServiceImpl<RzjgqdDao, RzjgqdRespVO
                 }
                 dataArray[10] = resultList.get(i).getRzrq();
                 dataArray[11] = dictdetaServcice.queryDictName(DictConstant.FPDK_TYPE,resultList.get(i).getDklx());
+                dataArray[12] = resultList.get(i).getSnVoucherNumber();
+                dataArray[13] = resultList.get(i).getPostingTime();
+                dataArray[14] = resultList.get(i).getImageNumber();
+                dataArray[15] = resultList.get(i).getAccountPeriod();
+                dataArray[16] = resultList.get(i).getBzdh();
+                dataArray[17] = resultList.get(i).getBzr();
+                dataArray[18] = resultList.get(i).getInAccountStatus();
+                dataArray[19] = resultList.get(i).getCompCode();
                 returnList.add(dataArray);
             }
 
diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/RzjgqdExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/RzjgqdExportThread.java
index 2869d4ee..045d1dc2 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/thread/RzjgqdExportThread.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/thread/RzjgqdExportThread.java
@@ -57,7 +57,8 @@ public class RzjgqdExportThread extends BaseThread {
      * 导出excel的列名
      */
     private final String[] titleColumns =
-        {"序号", "发票代码", "发票号码", "发票类型", "开票日期", "销方税号", "销方名称", "金额", "税额", "抵扣税额", "认证日期", "抵扣类型","凭证号","过账时间","影像号","账期","报账单号","报账人","入账状态","所属组织"};
+        {"序号", "发票代码", "发票号码", "发票类型", "开票日期", "销方税号", "销方名称", "金额", "税额", "抵扣税额", "认证日期",
+                "抵扣类型","凭证号","过账时间","影像号","账期","报账单号","报账人","入账状态","所属组织"};
 
     private final IExcelExportlogService exportLogService;
 
diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/RzjgqdPdfExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/RzjgqdPdfExportThread.java
index 17d28a98..ec842842 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/thread/RzjgqdPdfExportThread.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/thread/RzjgqdPdfExportThread.java
@@ -57,7 +57,8 @@ public class RzjgqdPdfExportThread extends BaseThread {
      * 导出excel的列名
      */
     private final String[] titleColumns =
-        {"序号", "发票代码", "发票号码", "发票类型", "开票日期", "销方税号", "销方名称", "金额", "税额", "抵扣税额", "认证日期", "抵扣类型"};
+        {"序号", "发票代码", "发票号码", "发票类型", "开票日期", "销方税号", "销方名称", "金额", "税额", "抵扣税额", "认证日期", "抵扣类型"
+                ,"凭证号","过账时间","影像号","账期","报账单号","报账人","入账状态","所属组织"};
 
     private final IExcelExportlogService exportLogService;
 
diff --git a/dxhy-core/src/main/resources/mapper/RzjgqdMapper.xml b/dxhy-core/src/main/resources/mapper/RzjgqdMapper.xml
index a27326f0..a5011da7 100644
--- a/dxhy-core/src/main/resources/mapper/RzjgqdMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/RzjgqdMapper.xml
@@ -16,6 +16,14 @@
         <result column="dkse" property="dkse"/>
         <result column="rzrq" property="rzrq"/>
         <result column="dklx" property="dklx"/>
+        <result column="snVoucherNumber" property="snVoucherNumber"/>
+        <result column="postingTime" property="postingTime"/>
+        <result column="imageId" property="imageNumber"/>
+        <result column="account_period" property="accountPeriod"/>
+        <result column="bzdh" property="bzdh"/>
+        <result column="bzr" property="bzr"/>
+        <result column="inAccountStatus" property="inAccountStatus"/>
+        <result column="compCode" property="compCode"/>
     </resultMap>
 
     <select id="rzjgByGfshAndSkssq" parameterType="java.util.Map"
@@ -30,7 +38,7 @@
         t.account_period as account_period,
         t.bzdh,
         t.bzr,
-        t.inaccount_status as inaccountStatus,
+        t.inaccount_status as inAccountStatus,
         t.comp_code as compCode
         from t_dx_record_invoice t
         where t.invoice_type in ('01','03','08','14','31') and t.auth_status = '4' <!--and rzh_yesorno='1'-->