From 9a9276ec957b5ee6f07abc63eab913563bf81492 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Sat, 7 Oct 2023 14:01:27 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E5=A2=9E=E5=8A=A0=E6=89=8B=E5=B7=A5?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E8=AE=A4=E8=AF=81=E7=8A=B6=E6=80=81&?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=9F=A5=E8=AF=A2=E8=AE=A4=E8=AF=81=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BaseInvoiceController.java     |  4 ++++
 .../main/resources/mapper/BaseFpZhMapper.xml  | 10 ++++++++--
 .../resources/mapper/BaseSggxcxMapper.xml     | 19 +++++++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
index 78acc49a..a04caafa 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
@@ -499,6 +499,7 @@ public class BaseInvoiceController extends AbstractController {
         String kpksrq = (String)map.get("kpksrq");
         String kpjsrq = (String)map.get("kpjsrq");
         String qszt = (String)map.get("qszt");
+        String rzzt = (String)map.get("rzzt");
         String qsfs = (String)map.get("qsfs");
         String businessCode = (String)map.get("businessCode");
         String invoiceNo = (String)map.get("invoiceNo");
@@ -594,6 +595,9 @@ public class BaseInvoiceController extends AbstractController {
             pramsMap.put("taxRate",taxRate);
         }
 
+        if (StringUtils.isNotBlank(rzzt) && !"99".equals(rzzt)){
+            pramsMap.put("rzzt",rzzt);
+        }
 
         if (!StringUtils.isBlank(invoiceType)) {
             if (!"99".equals(invoiceType)) {
diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
index cb95acee..30e678fe 100644
--- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
@@ -124,9 +124,12 @@
         <if test="imageId != null and imageId != '' and imageId != 'null' ">
             and t.image_id = #{imageId}
         </if>
-        <if test="rzclzt !=null and rzclzt != ''">
+        <if test="rzclzt == '0'.toString() or rzclzt == '4'.toString() or rzclzt == '5'.toString() or rzclzt == '6'.toString()">
             and t.auth_status = #{rzclzt}
         </if>
+        <if test="rzclzt == '1'.toString() ">
+            and (t.auth_status = '2' or t.auth_status = '3' or t.auth_status = '4')
+        </if>
         <if test="rzlx!=null and rzlx!=''">
             and t.bdk_status = #{rzlx}
         </if>
@@ -402,9 +405,12 @@
         <if test="rzzt != null and rzzt != '' and rzzt != 'null' ">
             and t.rzh_yesorno = #{rzzt}
         </if>
-        <if test="rzclzt != null and rzclzt != '' and rzclzt != 'null' ">
+        <if test="rzclzt == '0'.toString() or rzclzt == '4'.toString() or rzclzt == '5'.toString() or rzclzt == '6'.toString()">
             and t.auth_status = #{rzclzt}
         </if>
+        <if test="rzclzt == '1'.toString() ">
+            and (t.auth_status = '2' or t.auth_status = '3' or t.auth_status = '4')
+        </if>
         <if test="rzlx!=null and rzlx!=''">
             and t.bdk_status = #{rzlx}
         </if>
diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index a8ec9d0c..60045e48 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -129,6 +129,15 @@
         <if test="qszt != null and qszt != '' and qszt != 'null' ">
             and t.qs_status = #{qszt}
         </if>
+        <if test="rzzt == '0'.toString()">
+            and t.auth_status = #{rzzt}
+        </if>
+        <if test="rzzt == '1'.toString()">
+            and (t.auth_status = '2' or t.auth_status = '3')
+        </if>
+        <if test="rzzt == '2'.toString()">
+            and t.auth_status = '5'
+        </if>
 
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.inaccount_status = #{inAccountStatus}
@@ -442,6 +451,16 @@
         <if test="qszt != null and qszt != '' and qszt != 'null' ">
             and t.qs_status = #{qszt}
         </if>
+        <if test="rzzt == '0'.toString()">
+            and t.auth_status = #{rzzt}
+        </if>
+        <if test="rzzt == '1'.toString()">
+            and (t.auth_status = '2' or t.auth_status = '3')
+        </if>
+        <if test="rzzt == '2'.toString()">
+            and t.auth_status = '5'
+        </if>
+
         <if test="suspendStatus != null and suspendStatus != '' and suspendStatus != 'null' and suspendStatus != '99' and suspendStatus == '1'.toString()">
             and t.suspend_status = '1'
         </if>