From 12215e888b42995435b95d727753a7c4cadf3ff0 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Tue, 18 Apr 2023 17:30:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=BE=E6=94=B6=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2invoice=5Ftype=E5=8A=A8=E6=80=81sql?=
 =?UTF-8?q?=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

---
 .../resources/mapper/SignInvoiceMapper.xml    | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/dxhy-sign/src/main/resources/mapper/SignInvoiceMapper.xml b/dxhy-sign/src/main/resources/mapper/SignInvoiceMapper.xml
index ac9a2335..d20485af 100644
--- a/dxhy-sign/src/main/resources/mapper/SignInvoiceMapper.xml
+++ b/dxhy-sign/src/main/resources/mapper/SignInvoiceMapper.xml
@@ -115,16 +115,17 @@
         <if test="gfsh != null and gfsh != '' and gfsh != 'null' and gfsh != '99' ">
             and t.gf_tax_no = #{gfsh}
         </if>
-        <!--
+<!--        <if test="invoiceType != null and invoiceType != '' and invoiceType != 'null' ">-->
+<!--            and t.invoice_type = #{invoiceType}-->
+<!--        </if>-->
+<!--        <if test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType == '14' ">-->
+<!--            and (r.invoice_type = '14' or (r.invoice_type = '32' and r.lq_tdyslxDm='08') )-->
+<!--        </if>-->
+<!--        <if test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType == '32' ">-->
+<!--            and r.invoice_type = #{invoiceType} and r.lq_tdyslxDm!='08'-->
+<!--        </if>-->
         <if test="invoiceType != null and invoiceType != '' and invoiceType != 'null' ">
-            and t.invoice_type = #{invoiceType}
-        </if>
-        -->
-        <if test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType == '14' ">
-            and (r.invoice_type = '14' or (r.invoice_type = '32' and r.lq_tdyslxDm='08') )
-        </if>
-        <if test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType == '32' ">
-            and r.invoice_type = #{invoiceType} and r.lq_tdyslxDm!='08'
+                    and r.invoice_type = #{invoiceType}
         </if>
         <if test="invoiceNo != null and invoiceNo != '' and invoiceNo != 'null' ">
             and t.invoice_no = #{invoiceNo}