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

@@ -357,7 +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"));
+        pramsMap.put("taxRate", taxRate);
 
         List<String> gfshList = new ArrayList<>();
         if (!"99".equals(gfsh) && StringUtils.isNotBlank(gfsh)) {

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

@@ -361,7 +361,7 @@
         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') or (t.invoice_type ='32' and t.lq_tdyslxDm='08'))
-        and t.auth_status != '0'
+        and t.auth_status in ('2','3','4')
         and t.bdk_status in ('1','2')
         and t.export_mark = '0'
         and t.company =#{company}