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

 Conflicts:

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

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

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

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

@@ -218,10 +218,10 @@
             and t.account_period = #{accountPeriod}
         </if>
         <if test="taxRate!=null and taxRate!='' and taxRate != null and taxRate !='99'">
-            and t.tax_rate like %#{taxRate}%
+            and t.tax_rate = #{taxRate}
         </if>
         <if test="taxRate==''">
-            and t.tax_rate  #{taxRate}
+            and t.tax_rate = #{taxRate}
         </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-->
@@ -563,7 +563,7 @@
             and t.tax_rate like %#{taxRate}%
         </if>
         <if test="taxRate==''">
-            and t.tax_rate  #{taxRate}
+            and t.tax_rate like #{taxRate}
         </if>
         order by t.bzdh desc
     </select>