Sfoglia il codice sorgente

本期开工预付款

yangyj 3 mesi fa
parent
commit
3faaf14d47

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

@@ -1028,6 +1028,8 @@ public class ExecutorMeter extends FormulaExecutor {
                                     if (Func.isNotEmpty(list)) {
                                         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 cur = list.stream().filter(s -> s.getPeriodSort() <= relate.getPeriodSort()).map(s -> BaseUtils.str2BigDecimal(s.getMeterMoney())).reduce(BigDecimal.ZERO, BigDecimal::add);
+                                        startPay.setCurrentPeriodPay(cur.toPlainString());
                                         startPay.setPreviousPeriodEndPay(pre.toPlainString());
                                         startPay.setCurrentPeriodEndPay(addFc.apply(startPay.getCurrentPeriodPay(), startPay.getPreviousPeriodEndPay()));
                                     }