Merge branches '0614-增加税率筛选条件' and 'test' of http://192.168.12.182/invoice/pt into test

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

@@ -235,11 +235,11 @@
         <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
             and t.account_period = #{accountPeriod}
         </if>
-        <if test="taxRate!=null and taxRate!='' and taxRate != null and taxRate !='99'">
+        <if test="taxRate!=null and taxRate!='' and taxRate!='不征税' and taxRate != null and taxRate !='99'">
             and t.tax_rate = #{taxRate}
         </if>
-        <if test="taxRate==''">
-            and t.tax_rate = #{taxRate}
+        <if test="taxRate=='不征税'">
+            and t.tax_rate like '%,%'
         </if>
     </select>
     <!-- order by t.rzh_date desc,t.invoice_date desc-->
@@ -498,11 +498,11 @@
         <if test="eleInvoiceNo!=null and eleInvoiceNo!='' and eleInvoiceNo!='null'">
             and t.ele_invoice_no = #{eleInvoiceNo}
         </if>
-        <if test="taxRate!=null and taxRate!='' and taxRate != null and taxRate !='99'">
+        <if test="taxRate!=null and taxRate!='' and taxRate!='不征税' and taxRate != null and taxRate !='99'">
             and t.tax_rate = #{taxRate}
         </if>
-        <if test="taxRate==''">
-            and t.tax_rate = #{taxRate}
+        <if test="taxRate=='不征税'">
+            and t.tax_rate like '%,%'
         </if>
     </select>
     <select id="selectRzfpHj" parameterType="java.util.Map"

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

@@ -217,11 +217,11 @@
         <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
             and t.account_period = #{accountPeriod}
         </if>
-        <if test="taxRate!=null and taxRate!='' and taxRate != null and taxRate !='99'">
+        <if test="taxRate!=null and taxRate!='' and taxRate != '不征税' and taxRate != null and taxRate !='99'">
             and t.tax_rate = #{taxRate}
         </if>
-        <if test="taxRate==''">
-            and t.tax_rate = #{taxRate}
+        <if test="taxRate=='不征税'">
+            and t.tax_rate like '%,%'
         </if>
 <!--        <if test="qsksrq != null and qsksrq != '' and qsksrq != 'null' and qsjsrq != null and qsjsrq != '' and qsjsrq != 'null'">-->
 <!--            order by t.qs_date desc,t.invoice_date desc-->
@@ -559,11 +559,11 @@
         <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
             and t.account_period = #{accountPeriod}
         </if>
-        <if test="taxRate!=null and taxRate!='' and taxRate != null and taxRate !='99'">
+        <if test="taxRate!=null and taxRate!='' and taxRate!='不征税' and taxRate != null and taxRate !='99'">
             and t.tax_rate = #{taxRate}
         </if>
-        <if test="taxRate==''">
-            and t.tax_rate = #{taxRate}
+        <if test="taxRate=='不征税'">
+            and t.tax_rate like '%,%'
         </if>
         order by t.bzdh desc
     </select>