导出和页面优化未认证和撤销认证查询条件

dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml

@@ -75,12 +75,14 @@
         from t_dx_record_invoice t
         WHERE t.invoice_date between #{kpksrq} and #{kpjsrq}
         and t.invoice_type in('01','03','08','14','31','283','161','183','185')
-        and t.bdk_status in ('1','2')
         and t.export_mark = '0'
         and t.auth_status in ('0','2','3','4','5','6')
         and t.company = #{company}
         and t.gf_tax_no = #{gfsh}
         and t.comp_code = #{companyCode}
+        <if test="rzclzt != null and rzclzt != '0'.toString() and rzclzt != '6'.toString()">
+            and t.bdk_status in ('1','2')
+        </if>
         <if test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' ">
             and t.invoice_status = #{invoiceStatus}
         </if>
@@ -361,9 +363,11 @@
         and t.comp_code = #{companyCode}
         and t.invoice_type in('01','03','08','14','31','283','161','183','185')
         and t.auth_status in ('0','2','3','4','5','6')
-        and t.bdk_status in ('1','2')
         and t.export_mark = '0'
         and t.company =#{company}
+        <if test="rzclzt != null and rzclzt != '0'.toString() and rzclzt != '6'.toString()">
+            and t.bdk_status in ('1','2')
+        </if>
         <if  test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' ">
             and t.invoice_status = #{invoiceStatus}
         </if>

dxhy-core/src/main/resources/mapper/FpZhMapper.xml

@@ -106,13 +106,15 @@
         from t_dx_record_invoice t
         WHERE t.invoice_date between #{kpksrq} and #{kpjsrq}
         and t.invoice_type in ('01','03','08','14','31','283','161','183','185')
-        and t.bdk_status in ('1','2')
         and t.export_mark = '0'
         and t.auth_status in ('0','2','3','4','5','6')
         and t.company = #{company}
         and t.gf_tax_no = #{gfsh}
         and t.comp_code = #{companyCode}
 
+        <if test="rzclzt != null and rzclzt != '0'.toString() and rzclzt != '6'.toString()">
+            and t.bdk_status in ('1','2')
+        </if>
         <if test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' ">
             and t.invoice_status = #{invoiceStatus}
         </if>