From 3f2d0e4693fa0cfd08b8b019a5b1fce96e46cc05 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Sun, 7 May 2023 09:49:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/ExtBbycfpcxMapper.xml        | 7 +++++--
 .../resources/mapper/index/ExtIndexStatisticsMapper.xml    | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml
index 163b54be..3889c8c8 100644
--- a/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml
@@ -90,7 +90,7 @@
             and t.rzh_yesorno = #{rzzt}
         </if>
         <if test="rzzt != null and rzzt == '3'">
-            and (t.rzh_yesorno = '2' OR t.rzh_yesorno = '3')
+            and (t.rzh_yesorno = '2' OR t.rzh_yesorno = '1')
         </if>
         <if test="xfmc != null and xfmc != '' and xfmc != 'null' ">
             and t.xf_name like CONCAT(#{xfmc},'%')
@@ -205,9 +205,12 @@
         <if test="qszt != null and qszt != '' and qszt != 'null' ">
             and t.qs_status = #{qszt}
         </if>
-        <if test="rzzt != null and rzzt != '' and rzzt != 'null' ">
+        <if test="rzzt != null and rzzt != '' and rzzt != 'null'  and rzzt != '3'">
             and t.rzh_yesorno = #{rzzt}
         </if>
+        <if test="rzzt != null and rzzt == '3'">
+            and (t.rzh_yesorno = '2' OR t.rzh_yesorno = '1')
+        </if>
         <if test="xfmc != null and xfmc != '' and xfmc != 'null' ">
             and t.xf_name like CONCAT(#{xfmc},'%')
         </if>
diff --git a/dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml b/dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml
index e0b7381a..f00a0a13 100644
--- a/dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml
@@ -1672,7 +1672,7 @@
             </foreach>
         </if>
         and invoice_status != '0'
-        and auth_status = '4'
+        and (rzh_yesorno = '1' or rzh_yesorno = '2')
         and invoice_type in ('01','03','08','14','31')
         and company = #{paramsData.company}
         and invoice_date between #{paramsData.kpksrq} and #{paramsData.kpjsrq}