From f58b0ebe45346af140efaaad7c863787ca79f83a Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Mon, 28 Aug 2023 09:27:37 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E6=9D=83=E9=99=90=E5=8A=9F=E8=83=BDbu?=
 =?UTF-8?q?g=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/export/impl/CustomsCollectServiceImpl.java    | 8 ++++++++
 dxhy-core/src/main/resources/mapper/RzjgqdMapper.xml      | 2 +-
 .../src/main/resources/mapper/CustomsJkszhcxMapper.xml    | 2 +-
 dxhy-extend/src/main/resources/mapper/ExtRzjgqdMapper.xml | 5 ++++-
 4 files changed, 14 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 f92b3a04..83ca3659 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
@@ -513,6 +513,14 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
                 vo.setExportAmount(AmountFormatUtil.fmtMicrometer(vo.getExportAmount()));
                 vo.setExportTaxAmount(AmountFormatUtil.fmtMicrometer(vo.getExportTaxAmount()));
                 vo.setExportYxse(AmountFormatUtil.fmtMicrometer(vo.getExportYxse()));
+
+                if("1".equals(vo.getInaccountStatus())){
+                    vo.setInaccountStatus("已入账");
+                }else{
+                    vo.setInaccountStatus("未入账");
+                }
+
+
                 i++;
             }
         }
diff --git a/dxhy-core/src/main/resources/mapper/RzjgqdMapper.xml b/dxhy-core/src/main/resources/mapper/RzjgqdMapper.xml
index a27326f0..f3ab62c4 100644
--- a/dxhy-core/src/main/resources/mapper/RzjgqdMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/RzjgqdMapper.xml
@@ -35,7 +35,7 @@
         from t_dx_record_invoice t
         where t.invoice_type in ('01','03','08','14','31') and t.auth_status = '4' <!--and rzh_yesorno='1'-->
         and t.gf_tax_no = #{gfsh}
-        and t.comp_code = #{companyCode}
+        and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
         <if test="skssq != null and skssq != '' and skssq != 'null' ">
             and t.rzh_belong_date = #{skssq}
         </if>
diff --git a/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml b/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml
index a1993371..72bfed55 100644
--- a/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml
+++ b/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml
@@ -58,7 +58,7 @@
             and t.bzdh = #{bzdh}
         </if>
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' ">
-            and t.inaccount_status = #{inAccountStatus}
+            and (t.inaccount_status != '1' or t.inaccount_status is null)
         </if>
         <if test="customsCode != null and customsCode != '' and customsCode != 'null'">
             and t.customs_code = #{customsCode}
diff --git a/dxhy-extend/src/main/resources/mapper/ExtRzjgqdMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtRzjgqdMapper.xml
index bbccafa4..609f23b8 100644
--- a/dxhy-extend/src/main/resources/mapper/ExtRzjgqdMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/ExtRzjgqdMapper.xml
@@ -47,7 +47,10 @@
         and t.auth_status = '4' <!--and rzh_yesorno='1'-->
         and t.company = #{company}
         and t.gf_tax_no = #{gfsh}
-        and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
+        and t.comp_code = #{companyCode}
+        <if test="skssq != null and skssq != '' and skssq != 'null' ">
+            and t.rzh_belong_date = #{skssq}
+        </if>
         <if test="dklx!=null and dklx!=''">
             <choose>
                 <when test='dklx=="99"'>