approve

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

@@ -1301,7 +1301,7 @@ public class ExecutorMeter extends FormulaExecutor {
                 /*没月累计*/
                 List<String> monthlySum= IntStream.rangeClosed(1,max).boxed().map(month->{
                     BigDecimal tmp=  monthMoney.entrySet().stream().filter(e->e.getKey()<=month).map(Map.Entry::getValue).reduce(BigDecimal.ZERO,BigDecimal::add);
-                    return  multiFc.apply(ratioFc.apply(tmp.toPlainString(),totalAmount),"100");
+                    return  ratioFc.apply(tmp.toPlainString(),totalAmount);
                 }).collect(Collectors.toList());
                 FormulaUtils.elementFindByCode(fdm,ConstructionSchedule.TBN+":key_22").ifPresent(t->{
                     elementWriter.write(t,monthlySum);
@@ -1322,13 +1322,13 @@ public class ExecutorMeter extends FormulaExecutor {
                     List<BigDecimal> planMonth = IntStream.range(0,12).boxed().map(i->chapterSchedules.stream().map(e->e.getArr()[i]).reduce(BigDecimal.ZERO,BigDecimal::add)).collect(Collectors.toList());
                     /*计划本月*/
                     FormulaUtils.elementFindByCode(fdm, ConstructionSchedule.TBN + ":key_28").ifPresent(t -> {
-                        List<String> value=planMonth.stream().map(BigDecimal::toPlainString).map(s-> multiFc.apply(ratioFc.apply(s,totalAmountPlan),"100")).collect(Collectors.toList());
+                        List<String> value=planMonth.stream().map(BigDecimal::toPlainString).map(s-> ratioFc.apply(s,totalAmountPlan)).collect(Collectors.toList());
                         elementWriter.write(t, value);
                     });
                     /*计划累计*/
                     planMonthSum = IntStream.range(0,12).boxed().map(i-> {
                                 String tmp=  planMonth.stream().filter(e -> planMonth.indexOf(e) <= i).reduce(BigDecimal.ZERO, BigDecimal::add).toPlainString();
-                                return multiFc.apply(ratioFc.apply(tmp,totalAmountPlan),"100");
+                                return ratioFc.apply(tmp,totalAmountPlan);
                             }
                     ).collect(Collectors.toList());
                     List<String> finalPlanMonthSum = planMonthSum;