From 5d93944a78791253babce2f737fc1e253657fd05 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Thu, 31 Aug 2023 18:26:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/service/export/impl/CustomsCollectServiceImpl.java | 5 +++++
 .../src/main/resources/mapper/TDxCustomsRecordMapper.xml    | 6 +++---
 2 files changed, 8 insertions(+), 3 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 d9f89da9..d80b6f01 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
@@ -431,6 +431,11 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
                 vo.setAuditStatus(AuditStatusEnum.getVal(vo.getAuditStatus()));
                 vo.setApplyCheck(ApplyCheckEnum.getVal(vo.getApplyCheck()));
                 vo.setCheckStatus(CheckStatusEnum.getVal(vo.getCheckStatus()));
+                if ("1".equals(vo.getInAccountStatus())){
+                    vo.setInAccountStatus("未入账");
+                }else {
+                    vo.setInAccountStatus("未入账");
+                }
                 i++;
             }
         }
diff --git a/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml b/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml
index 4ef09625..d9f7d40c 100644
--- a/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml
@@ -1030,7 +1030,7 @@
         t.remark,
         t.scan_id AS scanId,
         t.data_sources as dataSources,
-        t.dept_name as deptName
+        t.dept_name as deptName,
         r.sn_voucher_number as snVoucherNumber,
         r.posting_time as postingTime,
         r.image_id as imageId,
@@ -1114,14 +1114,14 @@
         t.remark,
         t.scan_id AS scanId,
         t.data_sources as dataSources,
-        t.dept_name as deptName
+        t.dept_name as deptName,
         r.sn_voucher_number as snVoucherNumber,
         r.posting_time as postingTime,
         r.image_id as imageId,
         r.account_period as account_period,
         r.bzdh,
         r.bzr,
-        r.inaccount_status as inaccountStatus,
+        r.inaccount_status as inAccountStatus,
         r.comp_code as compCode
         FROM
         t_dx_customs t inner join t_dx_customs_record r on t.customs_code = r.customs_code