Browse Source

暂列金额

yangyj 3 months ago
parent
commit
fa1343cce4

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

@@ -1711,7 +1711,7 @@ public class ExecutorMeter extends FormulaExecutor {
             });
             /*每月合计进度*/
             try {
-                String totalAmount=dataList.stream().filter(e->StringUtils.isNotEquals(e.getChapterName(),"暂定金额")).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);