Merge branches '0625-发票入库时存储整数税率' and 'release' of http://192.168.12.182/invoice/pt into release

dxhy-core/src/main/java/com/dxhy/core/thread/QyswxxExportThread.java

@@ -46,7 +46,7 @@ public class QyswxxExportThread extends BaseThread {
     /**
      * 文件名后缀
      */
-    private final String fileNameSurfix = ".xlsx";
+    private final String fileNameSurfix = ".xls";
     /**
      * 文件名中间分隔符
      */

dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java

@@ -46,7 +46,7 @@ public class RzFpxxExportThread extends BaseThread {
     /**
      * 文件名后缀
      */
-    private final String fileNameSurfix = ".xlsx";
+    private final String fileNameSurfix = ".xls";
     /**
      * 文件名中间分隔符
      */

dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java

@@ -564,20 +564,20 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
                                     int index = taxRateDetail.indexOf("%");
                                     if (index > 0) {
                                         taxRateDetail = taxRateDetail.substring(0, taxRateDetail.length() - 1);
-                                        Float num = Float.parseFloat(taxRateDetail);
-                                        if (num > 9) {
-                                            taxRateDetail = "0." + taxRateDetail;
-                                        } else {
-                                            if (!taxRateDetail.startsWith("0")) {
-                                                taxRateDetail = "0.0" + taxRateDetail;
-                                            }
-                                        }
+//                                        Float num = Float.parseFloat(taxRateDetail);
+//                                        if (num > 9) {
+//                                            taxRateDetail = "0." + taxRateDetail;
+//                                        } else {
+//                                            if (!taxRateDetail.startsWith("0")) {
+//                                                taxRateDetail = "0.0" + taxRateDetail;
+//                                            }
+//                                        }
                                     }
                                 }
                             }
 
                             if ("11".equals(invoiceType)) {
-                                taxRateDetail = "0.000";
+                                taxRateDetail = "0";
                             }
                             log.info("明细-发票税率为:{}", taxRateDetail);
                             snDetailMap.put("taxRate", taxRateDetail);