Merge branch 'dev_1.0.0' of http://git.unissense.tech/mula/fourcal into Branch_dev_1.0.0

dev_1.0.0
‘wangjiuyun 2024-10-29 17:08:00 +08:00
commit 6a4e423276
1 changed files with 1 additions and 0 deletions

View File

@ -725,6 +725,7 @@ public class ProjectController extends BaseController {
//付款计划表
List<ProjectBudgetPayPlan> budgetPayPlan = projectBudgetService.getBudgetPayPlan(project);
model.put("budgetPayPlan", budgetPayPlan);
model.put("budgetPayPlanTotal", budgetPayPlan.stream().filter(p->p.getPayAmount()!=null).map(p->p.getPayAmount()).reduce(BigDecimal.ZERO, BigDecimal::add));
//成本明细
List<ProjectBudgetCostDetail> budgetCostDetail = projectBudgetService.getBudgetCostDetail(project);
model.put("costDetails", budgetCostDetail);