|
@@ -1074,6 +1074,10 @@ public class ExecutorMeter extends FormulaExecutor {
|
|
|
if(preStart!=null) {
|
|
|
startPay.setPreviousPeriodEndPay(preStart.getCurrentPeriodEndPay());
|
|
|
startPay.setCurrentPeriodEndPay(preStart.getCurrentPeriodEndPay());
|
|
|
+ }else{
|
|
|
+ BigDecimal first = startPayForm.stream().map(s -> BaseUtils.str2BigDecimal(s.getMeterMoney())).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
+ startPay.setPreviousPeriodEndPay(first.toPlainString());
|
|
|
+ startPay.setCurrentPeriodEndPay(first.toPlainString());
|
|
|
}
|
|
|
}
|
|
|
}
|