From 41eb377952fb1c0b2013240ef66c50b87d617e35 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 25 Apr 2023 11:37:12 +0800
Subject: [PATCH 1/3] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E5=87=BA?=
 =?UTF-8?q?=E5=8F=A3=E8=BD=AC=E5=86=85=E9=94=80=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DomesticExportCustomsMapper.xml          | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml b/dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml
index 50f37f6b..c5c9aad6 100644
--- a/dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml
+++ b/dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml
@@ -318,13 +318,12 @@
             </foreach>
         </if>
 
-        <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
-            and p.bzdh = #{bzdh}
-        </if>
-
-        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
-            and p.inaccount_status = #{inAccountStatus}
-        </if>
+<!--        <if test="bzdh != null and bzdh != '' and bzdh != 'null'">-->
+<!--            and p.bzdh = #{bzdh}-->
+<!--        </if>-->
+<!--        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">-->
+<!--            and p.inaccount_status = #{inAccountStatus}-->
+<!--        </if>-->
 
         <if test="queryParams.gfsh!=null and queryParams.gfsh!=''">
             and p.gf_tax_no = #{queryParams.gfsh}

From de3ff02882f4038bc58320ce5c31426bcae1d6c6 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 25 Apr 2023 12:27:06 +0800
Subject: [PATCH 2/3] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E5=87=BA?=
 =?UTF-8?q?=E5=8F=A3=E8=BD=AC=E5=86=85=E9=94=80=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/DomesticExportCustomsMapper.xml   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml b/dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml
index c5c9aad6..69e5a4c0 100644
--- a/dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml
+++ b/dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml
@@ -421,9 +421,9 @@
             </foreach>
         </if>
 
-        <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
-            and p.bzdh = #{bzdh}
-        </if>
+<!--        <if test="bzdh != null and bzdh != '' and bzdh != 'null'">-->
+<!--            and p.bzdh = #{bzdh}-->
+<!--        </if>-->
 
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
             and p.inaccount_status = #{inAccountStatus}

From f244ca1794bd0076493957dd28d4a3fc2f02ceca Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 25 Apr 2023 12:52:58 +0800
Subject: [PATCH 3/3] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E5=87=BA?=
 =?UTF-8?q?=E5=8F=A3=E8=BD=AC=E5=86=85=E9=94=80=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/CustomsRecordMapper.xml  | 48 +++++++++----------
 .../mapper/DomesticExportCustomsMapper.xml    |  6 +--
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml b/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml
index 07cf8e3a..684414fb 100644
--- a/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml
+++ b/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml
@@ -284,13 +284,13 @@
         <if test="queryParams.bzdh != null and queryParams.bzdh != '' and queryParams.bzdh != 'null'">
             and p.bzdh = #{queryParams.bzdh}
         </if>
-        <if test="queryParams.inAccountStatus != null and queryParams.inAccountStatus != '' and queryParams.inAccountStatus != 'null'">
-            and p.inaccount_status = #{queryParams.inAccountStatus}
-        </if>
+<!--        <if test="queryParams.inAccountStatus != null and queryParams.inAccountStatus != '' and queryParams.inAccountStatus != 'null'">-->
+<!--            and p.inaccount_status = #{queryParams.inAccountStatus}-->
+<!--        </if>-->
 
-        <if test="queryParams.snVoucherNumber != null and queryParams.snVoucherNumber != '' and queryParams.snVoucherNumber != 'null' and queryParams.snVoucherNumber != '99'">
-            and p.sn_voucher_number = #{queryParams.snVoucherNumber}
-        </if>
+<!--        <if test="queryParams.snVoucherNumber != null and queryParams.snVoucherNumber != '' and queryParams.snVoucherNumber != 'null' and queryParams.snVoucherNumber != '99'">-->
+<!--            and p.sn_voucher_number = #{queryParams.snVoucherNumber}-->
+<!--        </if>-->
         <if test="queryParams.postingTimeStart != null and queryParams.postingTimeStart != '' and queryParams.postingTimeStart != 'null' and queryParams.postingTimeStart != '99' and queryParams.postingTimeEnd != null and queryParams.postingTimeEnd != '' and queryParams.postingTimeEnd != 'null' and queryParams.postingTimeEnd != '99'">
             and p.posting_time between #{queryParams.postingTimeStart} and #{queryParams.postingTimeEnd}
         </if>
@@ -385,13 +385,13 @@
         <if test="queryParams.bzdh != null and queryParams.bzdh != '' and queryParams.bzdh != 'null'">
             and p.bzdh = #{queryParams.bzdh}
         </if>
-        <if test="queryParams.inAccountStatus != null and queryParams.inAccountStatus != '' and queryParams.inAccountStatus != 'null'">
-            and p.inaccount_status = #{queryParams.inAccountStatus}
-        </if>
+<!--        <if test="queryParams.inAccountStatus != null and queryParams.inAccountStatus != '' and queryParams.inAccountStatus != 'null'">-->
+<!--            and p.inaccount_status = #{queryParams.inAccountStatus}-->
+<!--        </if>-->
 
-        <if test="queryParams.snVoucherNumber != null and queryParams.snVoucherNumber != '' and queryParams.snVoucherNumber != 'null' and queryParams.snVoucherNumber != '99'">
-            and p.sn_voucher_number = #{queryParams.snVoucherNumber}
-        </if>
+<!--        <if test="queryParams.snVoucherNumber != null and queryParams.snVoucherNumber != '' and queryParams.snVoucherNumber != 'null' and queryParams.snVoucherNumber != '99'">-->
+<!--            and p.sn_voucher_number = #{queryParams.snVoucherNumber}-->
+<!--        </if>-->
         <if test="queryParams.postingTimeStart != null and queryParams.postingTimeStart != '' and queryParams.postingTimeStart != 'null' and queryParams.postingTimeStart != '99' and queryParams.postingTimeEnd != null and queryParams.postingTimeEnd != '' and queryParams.postingTimeEnd != 'null' and queryParams.postingTimeEnd != '99'">
             and p.posting_time between #{queryParams.postingTimeStart} and #{queryParams.postingTimeEnd}
         </if>
@@ -409,9 +409,9 @@
         <if test="queryParams.bzdh != null and queryParams.bzdh != '' and queryParams.bzdh != 'null'">
             and p.bzdh = #{bzdh}
         </if>
-        <if test="queryParams.inaccountStatus != null and queryParams.inaccountStatus != '' and queryParams.inaccountStatus != 'null'">
-            and p.inaccount_status = #{inaccountStatus}
-        </if>
+<!--        <if test="queryParams.inaccountStatus != null and queryParams.inaccountStatus != '' and queryParams.inaccountStatus != 'null'">-->
+<!--            and p.inaccount_status = #{inaccountStatus}-->
+<!--        </if>-->
 
         <if test="queryParams.customsCode!=null and queryParams.customsCode!=''">
             and p.customs_code = #{queryParams.customsCode}
@@ -879,9 +879,9 @@
         <if test="queryParams.inAccountStatus != null and queryParams.inAccountStatus != '' and queryParams.inAccountStatus != 'null'">
             and p.inaccount_status = #{queryParams.inAccountStatus}
         </if>
-        <if test="queryParams.snVoucherNumber != null and queryParams.snVoucherNumber != '' and queryParams.snVoucherNumber != 'null' and queryParams.snVoucherNumber != '99'">
-            and p.sn_voucher_number = #{queryParams.snVoucherNumber}
-        </if>
+<!--        <if test="queryParams.snVoucherNumber != null and queryParams.snVoucherNumber != '' and queryParams.snVoucherNumber != 'null' and queryParams.snVoucherNumber != '99'">-->
+<!--            and p.sn_voucher_number = #{queryParams.snVoucherNumber}-->
+<!--        </if>-->
         <if test="queryParams.postingTimeStart != null and queryParams.postingTimeStart != '' and queryParams.postingTimeStart != 'null' and queryParams.postingTimeStart != '99' and queryParams.postingTimeEnd != null and queryParams.postingTimeEnd != '' and queryParams.postingTimeEnd != 'null' and queryParams.postingTimeEnd != '99'">
             and p.posting_time between #{queryParams.postingTimeStart} and #{queryParams.postingTimeEnd}
         </if>
@@ -1114,12 +1114,12 @@
         <if test="queryParams.bzdh != null and queryParams.bzdh != '' and queryParams.bzdh != 'null'">
             and p.bzdh = #{queryParams.bzdh}
         </if>
-        <if test="queryParams.inAccountStatus != null and queryParams.inAccountStatus != '' and queryParams.inAccountStatus != 'null'">
-            and p.inaccount_status = #{queryParams.inAccountStatus}
-        </if>
-        <if test="queryParams.snVoucherNumber != null and queryParams.snVoucherNumber != '' and queryParams.snVoucherNumber != 'null' and queryParams.snVoucherNumber != '99'">
-            and p.sn_voucher_number = #{queryParams.snVoucherNumber}
-        </if>
+<!--        <if test="queryParams.inAccountStatus != null and queryParams.inAccountStatus != '' and queryParams.inAccountStatus != 'null'">-->
+<!--            and p.inaccount_status = #{queryParams.inAccountStatus}-->
+<!--        </if>-->
+<!--        <if test="queryParams.snVoucherNumber != null and queryParams.snVoucherNumber != '' and queryParams.snVoucherNumber != 'null' and queryParams.snVoucherNumber != '99'">-->
+<!--            and p.sn_voucher_number = #{queryParams.snVoucherNumber}-->
+<!--        </if>-->
         <if test="queryParams.postingTimeStart != null and queryParams.postingTimeStart != '' and queryParams.postingTimeStart != 'null' and queryParams.postingTimeStart != '99' and queryParams.postingTimeEnd != null and queryParams.postingTimeEnd != '' and queryParams.postingTimeEnd != 'null' and queryParams.postingTimeEnd != '99'">
             and p.posting_time between #{queryParams.postingTimeStart} and #{queryParams.postingTimeEnd}
         </if>
diff --git a/dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml b/dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml
index 69e5a4c0..18941f74 100644
--- a/dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml
+++ b/dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml
@@ -425,9 +425,9 @@
 <!--            and p.bzdh = #{bzdh}-->
 <!--        </if>-->
 
-        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
-            and p.inaccount_status = #{inAccountStatus}
-        </if>
+<!--        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">-->
+<!--            and p.inaccount_status = #{inAccountStatus}-->
+<!--        </if>-->
 
         <if test="queryParams.gfsh!=null and queryParams.gfsh!=''">
             and p.gf_tax_no = #{queryParams.gfsh}