调整费用申请的预览2

src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java

@@ -80,30 +80,24 @@ public class TbsBudgetApplicationService {
         Map<Long,List<TbsBudgetCostItem>> 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+")");
+            theadHeader.setLabel(budgetCode+"("+budgetCostItem.getScheduleItemName()+")");
-            //todo 调整
+            //设置为提交时的金额数据
-            BigDecimal totalUsed = BigDecimal.ZERO;
+            theadHeader.setBudgetAmount(budgetCostItem.getScheduleItemAmount()
-            for (TbsBudgetCostItem costItem : tmpMap.get(scheduleItemBudgetId)) {
+                    .subtract(budgetCostItem.getScheduleItemAmountUsed()));
-                totalUsed = totalUsed.add(costItem.getCenterGoodsAmount());
+            theadHeader.setTotalAmount(budgetCostItem.getScheduleItemAmount());
-            }
+            BigDecimal applyAmount = budgetCostItem.getScheduleItemAmountApply()==null?BigDecimal.ZERO:budgetCostItem.getScheduleItemAmountApply();
-            theadHeader.setBudgetAmount(totalUsed);
+            theadHeader.setCostApplyAmount(applyAmount);
+            theadHeader.setCostAppliedAmount(budgetCostItem.getScheduleItemAmountUsed().subtract(applyAmount));
             topTheadHeaders.add(theadHeader);
         }
         //自定义超额预算