修改mapper文件

dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml

@@ -1097,10 +1097,14 @@
             and p.gf_tax_no = #{queryParams.gfsh}
         </if>
 
-        <if test="queryParams.rzhYesorno!=null and queryParams.rzhYesorno!=''">
+        <if test="queryParams.rzhYesorno!=null and queryParams.rzhYesorno!='' and queryParams.rezYesorno != '3'">
             and p.rzh_yesorno = #{queryParams.rzhYesorno}
         </if>
 
+        <if test="queryParams.rzhYesorno!=null and queryParams.rzhYesorno!='' and queryParams.rezYesorno == '3'">
+            and (p.rzh_yesorno = '1' or p.rzh_yesorno = '2')
+        </if>
+
         <if test="queryParams.rzlx!=null and queryParams.rzlx!=''">
             and p.bdk_status = #{queryParams.rzlx}
         </if>

dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml

@@ -82,9 +82,12 @@
         <if test="qszt != null and qszt != '' and qszt != 'null' and qszt != '99'">
             and t.qs_status = #{qszt}
         </if>
-        <if test="rzzt != null and rzzt != '' and rzzt != 'null' and rzzt != '99'">
+        <if test="rzzt != null and rzzt != '' and rzzt != 'null' and rzzt != '99' and rzzt != '3'">
             and t.rzh_yesorno = #{rzzt}
         </if>
+        <if test="rzzt != null and rzzt != '' and rzzt != 'null'  and rzzt == '3' ">
+            and (t.rzh_yesorno = '1' or t.rzh_yesorno = '2')
+        </if>
         <if test="rzlx != null and rzlx != '' and rzlx != 'null' and rzlx != '99'">
             and t.rzlx = #{rzlx}
         </if>
@@ -221,9 +224,12 @@
         <if test="qszt != null and qszt != '' and qszt != 'null' and qszt != '99'">
             and t.qs_status = #{qszt}
         </if>
-        <if test="rzzt != null and rzzt != '' and rzzt != 'null' and rzzt != '99'">
+        <if test="rzzt != null and rzzt != '' and rzzt != 'null' and rzzt != '99' and rzzt != '3'">
             and t.rzh_yesorno = #{rzzt}
         </if>
+        <if test="rzzt != null and rzzt != '' and rzzt != 'null' and rzzt != '99' and rzzt == '3'">
+            and (t.rzh_yesorno = '1' or t.rzt_yesorno = '2' )
+        </if>
         <if test="rzlx != null and rzlx != '' and rzlx != 'null' and rzlx != '99'">
             and t.rzlx = #{rzlx}
         </if>