From 1a1fc4d4481cc5dd77c6c04cb11fe2fcff0978d8 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Thu, 1 Jun 2023 14:37:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=9F=A5=E8=AF=A2=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=85=A8=E7=94=B5=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/ExtJxssbbMapper.xml | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/dxhy-extend/src/main/resources/mapper/ExtJxssbbMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtJxssbbMapper.xml
index 8b883a47..11a9b730 100644
--- a/dxhy-extend/src/main/resources/mapper/ExtJxssbbMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/ExtJxssbbMapper.xml
@@ -13,8 +13,10 @@
         select count(1) totalCount, ifnull(sum(invoice_amount), 0) totalAmount,
         ifnull(sum(dk_tax_amount), 0) totalTax
         FROM t_dx_record_invoice
-        WHERE valid='1' and invoice_type in ('01','03','08','14','31') AND invoice_status='0' AND
-        rzh_yesorno='1'
+        WHERE valid='1'
+        and (invoice_type in('01','03','08','14','31','283','161','183','185') or (invoice_type ='32' and t.lq_tdyslxDm='08'))
+        AND invoice_status='0'
+        AND rzh_yesorno='1'
         <if test="skssq !=null and skssq != ''">
             and rzh_belong_date = #{skssq}
         </if>
@@ -54,9 +56,11 @@
 
     <select id="getTotalOutTax" resultType="Double" databaseId="mysql">
         SELECT ifnull(sum(out_tax_amount), 0) FROM t_dx_record_invoice
-        WHERE valid='1' and invoice_type in ('01','03','08','14','31') AND invoice_status='0' AND
-        rzh_yesorno='1' AND
-        out_status in ('1','2')
+        WHERE valid='1'
+        and (invoice_type in('01','03','08','14','31','283','161','183','185') or (invoice_type ='32' and t.lq_tdyslxDm='08'))
+        AND invoice_status='0'
+        AND rzh_yesorno='1'
+        AND out_status in ('1','2')
         <if test="skssq !=null and skssq != ''">
             and out_belong_date = #{skssq}
         </if>
@@ -69,9 +73,11 @@
         out_reason rzhDate,
         ifnull(sum(out_tax_amount), 0) tax
         FROM t_dx_record_invoice
-        WHERE valid='1' and invoice_type in ('01','03','08','14','31') AND invoice_status='0' AND
-        rzh_yesorno='1' AND
-        out_status in ('1','2')
+        WHERE valid='1'
+        and (invoice_type in('01','03','08','14','31','283','161','183','185') or (invoice_type ='32' and t.lq_tdyslxDm='08'))
+        AND invoice_status='0'
+        AND rzh_yesorno='1'
+        AND out_status in ('1','2')
         <if test="skssq !=null and skssq != ''">
             and out_belong_date = #{skssq}
         </if>