From b28f06b54e5801cca237983244fcaf274e5b3f76 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Wed, 30 Aug 2023 18:57:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E5=86=85=E9=94=80=E7=BC=B4=E6=AC=BE?=
 =?UTF-8?q?=E4=B9=A6=E6=9F=A5=E8=AF=A2=E8=AE=A4=E8=AF=81=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/service/export/impl/CustomsCollectServiceImpl.java | 6 ++++++
 dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml | 2 +-
 dxhy-core/src/main/resources/mapper/TDxExportInvoiceDao.xml | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsCollectServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsCollectServiceImpl.java
index 103323f2..4b1ee5fd 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsCollectServiceImpl.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsCollectServiceImpl.java
@@ -582,6 +582,12 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
                 vo.setAuthStatus(dictdetaServcice.queryDictName(DictConstant.AUTH_STATUS_ALL, vo.getAuthStatus()));
                 vo.setBdkStatus(dictdetaServcice.queryDictName(DictConstant.BDK_STATUS, vo.getBdkStatus()));
 
+                if("1".equals(vo.getInAccountStatus())){
+                    vo.setInAccountStatus("已入账");
+                }else {
+                    vo.setInAccountStatus("未入账");
+                }
+
                 i++;
             }
         }
diff --git a/dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml b/dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml
index dbf00f3d..f947dd12 100644
--- a/dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml
+++ b/dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml
@@ -370,7 +370,7 @@
         p.account_period as account_period,
         p.bzdh,
         p.bzr,
-        p.inaccount_status as inaccountStatus,
+        p.inaccount_status as inAccountStatus,
         p.comp_code as compCode
         FROM
         t_dx_export_customs p
diff --git a/dxhy-core/src/main/resources/mapper/TDxExportInvoiceDao.xml b/dxhy-core/src/main/resources/mapper/TDxExportInvoiceDao.xml
index 68f689da..798664f8 100644
--- a/dxhy-core/src/main/resources/mapper/TDxExportInvoiceDao.xml
+++ b/dxhy-core/src/main/resources/mapper/TDxExportInvoiceDao.xml
@@ -376,7 +376,7 @@
         p.account_period as account_period,
         p.bzdh,
         p.bzr,
-        p.inaccount_status as inaccountStatus,
+        p.inaccount_status as inAccountStatus,
         p.comp_code as compCode
         FROM
         t_dx_export_invoice p