From 905979ca114182e489f6331715f3d309fa7d6939 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Thu, 18 Jan 2024 11:10:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=92=8C=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9C=AA=E8=AE=A4=E8=AF=81=E5=92=8C=E6=92=A4?=
 =?UTF-8?q?=E9=94=80=E8=AE=A4=E8=AF=81=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml | 8 ++++++--
 dxhy-core/src/main/resources/mapper/FpZhMapper.xml     | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
index 194e2588..4232ae31 100644
--- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
@@ -75,12 +75,14 @@
         from t_dx_record_invoice t
         WHERE t.invoice_date between #{kpksrq} and #{kpjsrq}
         and t.invoice_type in('01','03','08','14','31','283','161','183','185')
-        and t.bdk_status in ('1','2')
         and t.export_mark = '0'
         and t.auth_status in ('0','2','3','4','5','6')
         and t.company = #{company}
         and t.gf_tax_no = #{gfsh}
         and t.comp_code = #{companyCode}
+        <if test="rzclzt != null and rzclzt != '0'.toString() and rzclzt != '6'.toString()">
+            and t.bdk_status in ('1','2')
+        </if>
         <if test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' ">
             and t.invoice_status = #{invoiceStatus}
         </if>
@@ -361,9 +363,11 @@
         and t.comp_code = #{companyCode}
         and t.invoice_type in('01','03','08','14','31','283','161','183','185')
         and t.auth_status in ('0','2','3','4','5','6')
-        and t.bdk_status in ('1','2')
         and t.export_mark = '0'
         and t.company =#{company}
+        <if test="rzclzt != null and rzclzt != '0'.toString() and rzclzt != '6'.toString()">
+            and t.bdk_status in ('1','2')
+        </if>
         <if  test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' ">
             and t.invoice_status = #{invoiceStatus}
         </if>
diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
index 5096e391..be2b498c 100644
--- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
@@ -106,13 +106,15 @@
         from t_dx_record_invoice t
         WHERE t.invoice_date between #{kpksrq} and #{kpjsrq}
         and t.invoice_type in ('01','03','08','14','31','283','161','183','185')
-        and t.bdk_status in ('1','2')
         and t.export_mark = '0'
         and t.auth_status in ('0','2','3','4','5','6')
         and t.company = #{company}
         and t.gf_tax_no = #{gfsh}
         and t.comp_code = #{companyCode}
 
+        <if test="rzclzt != null and rzclzt != '0'.toString() and rzclzt != '6'.toString()">
+            and t.bdk_status in ('1','2')
+        </if>
         <if test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' ">
             and t.invoice_status = #{invoiceStatus}
         </if>