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

dxhy-base/src/main/java/com/dxhy/base/controller/BaseRzTDxRecordInvoiceController.java

@@ -319,6 +319,7 @@ public class BaseRzTDxRecordInvoiceController extends AbstractController {
         String qsr = (String)map.get("qsr");
         String bzdh = (String) map.get("bzdh");
         String bzr = (String) map.get("bzr");
+        String taxRate = String.valueOf(map.get("taxRate"));
         String inAccountStatus = (String) map.get("inAccountStatus");
         String sfkrz = (String)map.get("sfkrz");
         String suspendDate = (String) map.get("suspendDate");
@@ -356,6 +357,7 @@ public class BaseRzTDxRecordInvoiceController extends AbstractController {
         pramsMap.put("snVoucherNumber", map.get("snVoucherNumber"));
         pramsMap.put("postingTimeStart", map.get("postingTimeStart"));
         pramsMap.put("company", map.get("company"));
+        pramsMap.put("taxRate", map.get("taxRate"));
 
         List<String> gfshList = new ArrayList<>();
         if (!"99".equals(gfsh) && StringUtils.isNotBlank(gfsh)) {

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

@@ -1402,6 +1402,12 @@
         <if test="eleInvoiceNo!=null and eleInvoiceNo!='' and eleInvoiceNo!='null'">
             and t.ele_invoice_no = #{eleInvoiceNo}
         </if>
+        <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 like '%,%'
+        </if>
 
     </select>
     <select id="selectRzhAllHj" parameterType="java.util.Map"