保留小数位

blade-service/blade-manager/src/main/java/org/springblade/manager/formula/impl/ExecutorFormat.java

@@ -42,6 +42,12 @@ public class ExecutorFormat extends FormulaExecutor {
                         fd.setRepeat(true);
                     }
                 }
+                /*0不显示*/
+               fd.getValues().forEach(ed->{
+                   if(StringUtils.isEquals("0",ed.getValue())){
+                       ed.setValue(StringPool.EMPTY);
+                   }
+               });
 
             }
         }

blade-service/blade-manager/src/main/java/org/springblade/manager/formula/impl/ExecutorMeter.java

@@ -883,7 +883,7 @@ public class ExecutorMeter extends FormulaExecutor {
                  }
                  midPayItemList.forEach(e->{
                      String payNumber=e.getPayNumber();
-                     if(e.getPayName().contains("暂定")){
+                     if(e.getPayName().contains("暂")){
                          payNumber="ZLJE";
                      }
                      InterimPaymentCertificate ipc = paymentCertificateMap.get(payNumber);