From f2904cdb43c289ad5ec0b42a2d2acc1fffa08faf Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Thu, 18 May 2023 09:45:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BAmapper?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../export/impl/PoolPaperServiceImpl.java     | 36 +++++++++----------
 .../main/resources/mapper/ExtPaperMapper.xml  |  2 +-
 2 files changed, 19 insertions(+), 19 deletions(-)

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 85e5a25c..17d55642 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
@@ -291,42 +291,42 @@ public class PoolPaperServiceImpl extends MpBaseServiceImpl<PoolPaperDao, Invoic
 //                    else {
 //                        dataArray[25] = "未入账";
 //                    }
-                    dataArray[25] = pageList.get(i).getVoucherNo();
                     if ("0".equals(pageList.get(i).getAmortizeStatus())) {
-                        dataArray[26] = "否";
+                        dataArray[25] = "否";
                     } else if ("1".equals(pageList.get(i).getAmortizeStatus())) {
-                        dataArray[26] = "是";
+                        dataArray[25] = "是";
                     } else {
-                        dataArray[26] = "";
+                        dataArray[25] = "";
                     }
                     if (pageList.get(i).getAmortizeAmount() != null
                         && !"".equals(pageList.get(i).getAmortizeAmount())) {
-                        dataArray[27] =
+                        dataArray[26] =
                             AmountFormatUtil.fmtMicrometer(MathUtil.round(pageList.get(i).getAmortizeAmount()));
                     } else {
-                        dataArray[27] = "";
+                        dataArray[26] = "";
                     }
                     if (pageList.get(i).getRemainAmortizeAmount() != null
                         && !"".equals(pageList.get(i).getRemainAmortizeAmount())) {
-                        dataArray[28] =
+                        dataArray[27] =
                             AmountFormatUtil.fmtMicrometer(MathUtil.round(pageList.get(i).getRemainAmortizeAmount()));
                     } else {
-                        dataArray[28] = "";
+                        dataArray[27] = "";
                     }
 
-                    dataArray[29] = pageList.get(i).getDocumentNumber();
-                    dataArray[30] = pageList.get(i).getCreateDate();
-                    dataArray[31] = pageList.get(i).getSnVoucherNumber();
-                    dataArray[32] = pageList.get(i).getPostingTime();
-                    dataArray[33] = pageList.get(i).getAccountPeriod();
-                    dataArray[34] = pageList.get(i).getImageId();
-                    dataArray[35] = pageList.get(i).getBzdh();
+                    dataArray[28] = pageList.get(i).getDocumentNumber();
+                    dataArray[29] = pageList.get(i).getCreateDate();
+                    dataArray[30] = pageList.get(i).getSnVoucherNumber();
+                    dataArray[31] = pageList.get(i).getPostingTime();
+                    dataArray[32] = pageList.get(i).getAccountPeriod();
+                    dataArray[33] = pageList.get(i).getImageId();
+                    dataArray[34] = pageList.get(i).getBzdh();
+                    log.info("入账状态====>{}",pageList.get(i).getInAccountStatus());
                     if (pageList.get(i).getInAccountStatus() != null && "1".equals(pageList.get(i).getInAccountStatus())){
-                        dataArray[36] = "已入账";
+                        dataArray[35] = "已入账";
                     }else {
-                        dataArray[36] = "未入账";
+                        dataArray[35] = "未入账";
                     }
-                    dataArray[37] = pageList.get(i).getCompCode();
+                    dataArray[36] = pageList.get(i).getCompCode();
                     returnList.add(dataArray);
                 }
             }
diff --git a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml
index 37824d4a..259505e6 100644
--- a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml
@@ -263,7 +263,7 @@
         t.source_system sourceSystem,
         t.is_sale_list listStatus,
         t.remark remark,
-        t.sn_voucher_number snVoucherName,
+        t.sn_voucher_number snVoucherNumber,
         t.posting_time,
         t.image_id imageId,
         t.account_period accountPeriod,