From d5d2b2360674bf5424566ca675e7ce35a378e276 Mon Sep 17 00:00:00 2001 From: Yen Date: Wed, 1 Feb 2023 15:02:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=B4=B9=E7=94=A8=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E7=9A=84=E9=A2=84=E8=A7=882?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/TbsBudgetApplicationService.java | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java index 09636abb..8f00a20d 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java @@ -80,30 +80,24 @@ public class TbsBudgetApplicationService { Map> tmpMap = budgetCostItems.stream().collect(Collectors.groupingBy(TbsBudgetCostItem::getScheduleItemBudgetId)); for (Long scheduleItemBudgetId : tmpMap.keySet()) { if(scheduleItemBudgetId.equals(0L)){continue;} - TbsBudgetCostItem itemBudget = tmpMap.get(scheduleItemBudgetId).get(0); + TbsBudgetCostItem budgetCostItem = tmpMap.get(scheduleItemBudgetId).get(0); String budgetCode = null; for (TbsBudget budget : budgetList) { - if(budget.getId().equals(itemBudget.getBudgetId())){ + if(budget.getId().equals(budgetCostItem.getBudgetId())){ budgetCode = budget.getBudgetCode(); break; } } - String scheduleItemName = null; - for (TbsScheduleItemBudget scheduleItemBudget : scheduleItemList) { - if(scheduleItemBudget.getId().equals(scheduleItemBudgetId)){ - scheduleItemName = scheduleItemBudget.getItemName(); - break; - } - } TbsBudgetTableVo.TopTheadHeader theadHeader = new TbsBudgetTableVo.TopTheadHeader(); theadHeader.setId(scheduleItemBudgetId+""); - theadHeader.setLabel(budgetCode+"("+scheduleItemName+")"); - //todo 调整 - BigDecimal totalUsed = BigDecimal.ZERO; - for (TbsBudgetCostItem costItem : tmpMap.get(scheduleItemBudgetId)) { - totalUsed = totalUsed.add(costItem.getCenterGoodsAmount()); - } - theadHeader.setBudgetAmount(totalUsed); + theadHeader.setLabel(budgetCode+"("+budgetCostItem.getScheduleItemName()+")"); + //设置为提交时的金额数据 + theadHeader.setBudgetAmount(budgetCostItem.getScheduleItemAmount() + .subtract(budgetCostItem.getScheduleItemAmountUsed())); + theadHeader.setTotalAmount(budgetCostItem.getScheduleItemAmount()); + BigDecimal applyAmount = budgetCostItem.getScheduleItemAmountApply()==null?BigDecimal.ZERO:budgetCostItem.getScheduleItemAmountApply(); + theadHeader.setCostApplyAmount(applyAmount); + theadHeader.setCostAppliedAmount(budgetCostItem.getScheduleItemAmountUsed().subtract(applyAmount)); topTheadHeaders.add(theadHeader); } //自定义超额预算