From cc5a0d6c1ed0325916bb6468896f41c94c3c32e9 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Tue, 29 Aug 2023 13:56:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=8F=A3=E8=BD=AC=E5=86=85=E9=94=80?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=85=A5=E8=B4=A6=E7=8A=B6=E6=80=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dxhy/core/model/ExportCustomsRzcxVO.java     |  2 +-
 .../com/dxhy/core/model/ExportInvoiceRzcxVO.java     |  2 +-
 .../export/impl/CustomsCollectServiceImpl.java       | 12 +++++++++---
 .../main/resources/mapper/TDxExportCustomsDao.xml    |  2 +-
 .../main/resources/mapper/TDxExportInvoiceDao.xml    |  2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)

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 3be7a7e1..d4fe5470 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
@@ -38,7 +38,7 @@ public class ExportCustomsRzcxVO {
     private String imageId;
     private String accountPeriod;
     private String compCode;
-    private String inaccountStatus;
+    private String inAccountStatus;
     private String bzdh;
     private String bzr;
 
diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/ExportInvoiceRzcxVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/ExportInvoiceRzcxVO.java
index 8c77333b..2a4531a4 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/model/ExportInvoiceRzcxVO.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/model/ExportInvoiceRzcxVO.java
@@ -37,7 +37,7 @@ public class ExportInvoiceRzcxVO {
     private String imageId;
     private String accountPeriod;
     private String compCode;
-    private String inaccountStatus;
+    private String inAccountStatus;
     private String bzdh;
     private String bzr;
 
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 66e115ab..bf4522bf 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
@@ -369,6 +369,12 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
                 vo.setAuthStatus(dictdetaServcice.queryDictName(DictConstant.AUTH_STATUS_ALL, vo.getAuthStatus()));
                 vo.setCxrzStatus(dictdetaServcice.queryDictName(DictConstant.CXRZ_STATUS, vo.getCxrzStatus()));
                 vo.setBdkStatus(dictdetaServcice.queryDictName(DictConstant.BDK_STATUS, vo.getBdkStatus()));
+
+                if ("1".equals(vo.getInAccountStatus())){
+                    vo.setInAccountStatus("已入账");
+                }else {
+                    vo.setInAccountStatus("未入账");
+                }
                 i++;
             }
         }
@@ -519,10 +525,10 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
                 vo.setExportTaxAmount(AmountFormatUtil.fmtMicrometer(vo.getExportTaxAmount()));
                 vo.setExportYxse(AmountFormatUtil.fmtMicrometer(vo.getExportYxse()));
 
-                if("1".equals(vo.getInaccountStatus())){
-                    vo.setInaccountStatus("已入账");
+                if("1".equals(vo.getInAccountStatus())){
+                    vo.setInAccountStatus("已入账");
                 }else{
-                    vo.setInaccountStatus("未入账");
+                    vo.setInAccountStatus("未入账");
                 }
 
 
diff --git a/dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml b/dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml
index 731270d7..dbf00f3d 100644
--- a/dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml
+++ b/dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml
@@ -178,7 +178,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 1a5ec71f..68f689da 100644
--- a/dxhy-core/src/main/resources/mapper/TDxExportInvoiceDao.xml
+++ b/dxhy-core/src/main/resources/mapper/TDxExportInvoiceDao.xml
@@ -81,7 +81,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