中期支付证书

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

@@ -975,9 +975,9 @@ public class ExecutorMeter extends FormulaExecutor {
                      if(tec.meterInfo.getStartPayFormAll()!=null){
                         List<StartPayForm> startPayForm = tec.getMeterInfo().getStartPayFormAll();
                         if(startPayForm.size()>0){
-                           BigDecimal current= 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().equals(tec.periodInfo.getSort())).map(s->BaseUtils.str2BigDecimal(s.getMeterMoney())).reduce(BigDecimal.ZERO,BigDecimal::add);
-                           startPay.setCurrentPeriodPay(current.toPlainString());
+                           BigDecimal  end = startPayForm.stream().filter(s->s.getPeriodSort()<=tec.periodInfo.getSort()).map(s->BaseUtils.str2BigDecimal(s.getMeterMoney())).reduce(BigDecimal.ZERO,BigDecimal::add);
+                           BigDecimal  current= startPayForm.stream().filter(s-> s.getPeriodSort().equals(tec.periodInfo.getSort())).map(s->BaseUtils.str2BigDecimal(s.getMeterMoney())).reduce(BigDecimal.ZERO,BigDecimal::add);
+                           /*startPay.setCurrentPeriodPay(current.toPlainString());*/
                            startPay.setCurrentPeriodEndPay(end.toPlainString());
                            String pre=subtractFc.apply(end.toPlainString(),current.toPlainString());
                            if(!pre.contains("-")) {