完成数量改成浮点数

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/Payment.java

@@ -33,7 +33,7 @@ public class Payment {
     /**变更数量*/
     private Integer changeTotal;
     /**完成数量*/
-    private Integer completed;
+    private Double completed;
     /**消费金额*/
     private String money;
     /**章节*/

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/SubInterimMeterPaySummary.java

@@ -81,11 +81,11 @@ public class SubInterimMeterPaySummary implements  DataModel{
         this.setCurrentPeriodPay(list.stream().filter(BaseUtils::isNumber).map(BigDecimal::new).reduce(BigDecimal.ZERO,BigDecimal::add).toString());
     }
 
-    public void completedAdd(Integer n){
+    public void completedAdd(Double n){
         List<Object> list = new ArrayList<>();
         list.add(this.getCompleted());
         list.add(n);
-        this.setCompleted(String.valueOf(list.stream().filter(BaseUtils::isNumber).map(Object::toString).mapToInt(Integer::parseInt).sum()));
+        this.setCompleted(String.valueOf(list.stream().filter(BaseUtils::isNumber).map(Object::toString).mapToDouble(BaseUtils::obj2DoubleZero).sum()));
     }
 
     /*获取分项工程元素码*/

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/SubprojectInterimPaymentSummary.java

@@ -38,7 +38,7 @@ public class SubprojectInterimPaymentSummary  implements  DataModel{
     /**合同数量*/
     @JSONField(name = "key_3",label="合同数量",ordinal = 3)
     private String contractTotal;
-    @JSONField(name = "key_17",label="单价-ZJ",ordinal = 102)
+    @JSONField(name = "key_17",label="单价-ZJ",ordinal = 3)
     private String price;
     /**变更数量*/
     @JSONField(name = "key_4",label="变更数量",ordinal = 4)

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

@@ -719,7 +719,7 @@ public class ExecutorMeter extends FormulaExecutor {
             /**变更数量*/
             private Integer changeTotal =0;
             /**完成数量*/
-            private Integer completed=0;
+            private Double completed=0D;
             /**单价*/
             private String price;
 /*            本次完成数量