From 653934eadced826ecefaddfb302444d6d23bf3ae Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Fri, 4 Aug 2023 15:18:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=B7=E5=85=B3=E7=BC=B4=E6=AC=BE=E4=B9=A6?=
 =?UTF-8?q?=E7=AD=BE=E6=94=B6=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customs/service/impl/CustomsSignServiceImpl.java |  5 +++++
 .../main/resources/mapper/CustomsRecordMapper.xml    | 12 ++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsSignServiceImpl.java b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsSignServiceImpl.java
index 8e99ccfa..b8d9f982 100644
--- a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsSignServiceImpl.java
+++ b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsSignServiceImpl.java
@@ -574,6 +574,11 @@ public class CustomsSignServiceImpl extends MpBaseServiceImpl<CustomsRecordDao,
                 } else {
                     map.put("collectState", false);
                 }
+                if ("1".equals(map.get("inAccountStatus"))){
+                    map.put("inAccountStatus","已入账");
+                }else {
+                    map.put("inAccountStatus","未入账");
+                }
             }
         }
         return resultData.getPageData(result).toJsonBase();
diff --git a/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml b/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml
index af527aca..bad4af07 100644
--- a/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml
+++ b/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml
@@ -1024,9 +1024,17 @@
         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 imageNumber,
+        r.account_period as accountPeriod,
+        r.bzdh as bzdh,
+        r.bzr as bzr,
+        r.inaccount_status as  inAccountStatus,
+        r.comp_code as compCode
         FROM
-        t_dx_customs t
+        t_dx_customs t left join t_dx_customs_record r on t.customs_code = r.customs_code
         where t.user_account = #{queryParams.userAccount}
         <if test="queryParams.gfTaxNoList!=null  and queryParams.gfTaxNoList.size>0">
             and t.gf_tax_no in