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 @@
and t.image_id = #{imageId}
-
+
and t.auth_status = #{rzclzt}
+
+ and (t.auth_status = '2' or t.auth_status = '3' or t.auth_status = '4')
+
and t.bdk_status = #{rzlx}
@@ -402,9 +405,12 @@
and t.rzh_yesorno = #{rzzt}
-
+
and t.auth_status = #{rzclzt}
+
+ and (t.auth_status = '2' or t.auth_status = '3' or t.auth_status = '4')
+
and t.bdk_status = #{rzlx}
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 @@
and t.qs_status = #{qszt}
+
+ and t.auth_status = #{rzzt}
+
+
+ and (t.auth_status = '2' or t.auth_status = '3')
+
+
+ and t.auth_status = '5'
+
and t.inaccount_status = #{inAccountStatus}
@@ -442,6 +451,16 @@
and t.qs_status = #{qszt}
+
+ and t.auth_status = #{rzzt}
+
+
+ and (t.auth_status = '2' or t.auth_status = '3')
+
+
+ and t.auth_status = '5'
+
+
and t.suspend_status = '1'