|
@@ -997,6 +997,7 @@ public class ExecutorMeter extends FormulaExecutor {
|
|
StartPayForm relate = list.get(list.size() - 1);
|
|
StartPayForm relate = list.get(list.size() - 1);
|
|
BigDecimal pre = startPayForm.stream().filter(s -> s.getPeriodSort() <= relate.getPeriodSort()).map(s -> BaseUtils.str2BigDecimal(s.getMeterMoney())).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
BigDecimal pre = startPayForm.stream().filter(s -> s.getPeriodSort() <= relate.getPeriodSort()).map(s -> BaseUtils.str2BigDecimal(s.getMeterMoney())).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
startPay.setPreviousPeriodEndPay(pre.toPlainString());
|
|
startPay.setPreviousPeriodEndPay(pre.toPlainString());
|
|
|
|
+ startPay.setCurrentPeriodEndPay(addFc.apply(startPay.getCurrentPeriodPay(),startPay.getPreviousPeriodEndPay()));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
/* BigDecimal end = startPayForm.stream().filter(s->s.getPeriodSort()<=tec.periodInfo.getSort()).map(s->BaseUtils.str2BigDecimal(s.getMeterMoney())).reduce(BigDecimal.ZERO,BigDecimal::add);
|
|
/* BigDecimal end = startPayForm.stream().filter(s->s.getPeriodSort()<=tec.periodInfo.getSort()).map(s->BaseUtils.str2BigDecimal(s.getMeterMoney())).reduce(BigDecimal.ZERO,BigDecimal::add);
|