2-4bug

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

@@ -1273,7 +1273,7 @@ public class ExecutorMeter extends FormulaExecutor {
                      /*分行合计列，合计的时候需要计入手填部分*/
                      fieldGetSet(x->!x.getIsSummary(),InterimPaymentCertificate::getInvertState);
                      InterimPaymentCertificate finalBlj = blj;
-                     dataList.stream().filter(e-> "小计".equals(e.getChapterSeq())).findFirst().ifPresent(t->{
+                     dataList.stream().filter(e-> "合计".equals(e.getChapterSeq())).findFirst().ifPresent(t->{
                          finalBlj.setCurrentPeriodPay(StringUtils.number2String(multiFc.apply(t.getCurrentPeriodPay(),"0.1"),0));
                          if(BaseUtils.obj2DoubleZero(t.getPreviousPeriodEndPay())>0) {
                              finalBlj.setPreviousPeriodEndPay(StringUtils.number2String(multiFc.apply(t.getPreviousPeriodEndPay(), "0.1"),0));
@@ -1732,7 +1732,7 @@ public class ExecutorMeter extends FormulaExecutor {
             });
             /*每月合计进度*/
             try {
-                String totalAmount=dataList.stream().filter(e->e.getChapterName().startsWith("暂")).map(ConstructionSchedule::getChangeMoney).map(BaseUtils::str2BigDecimal).reduce(BigDecimal.ZERO,BigDecimal::add).toPlainString();
+                String totalAmount=dataList.stream().filter(e->!e.getChapterName().startsWith("暂")).map(ConstructionSchedule::getChangeMoney).map(BaseUtils::str2BigDecimal).reduce(BigDecimal.ZERO,BigDecimal::add).toPlainString();
                 /*合同计划结束日期年末*/
                 LocalDate planStartDate=LocalDate.parse(baseInfo.getStartDatePlan(),BaseUtils.chineseDateFm);
                 LocalDate planEndDate=LocalDate.parse(baseInfo.getEndDatePlan(),BaseUtils.chineseDateFm);