From ac9778d8c7fe470bd80f85beefc0ed091a2ace84 Mon Sep 17 00:00:00 2001 From: "15989082884@163.com" <15989082884@163.com> Date: Sun, 2 Jul 2023 15:05:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=AE=E6=A0=87=E5=8F=91=E8=B4=A7=E9=A2=9D?= =?UTF-8?q?=20OA=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tbs/entity/dto/TbsCostSubItem.java | 9 ++++++++ .../tbs/service/TbsBudgetCostItemService.java | 7 ++++++ .../impl/TbsBudgetCostItemServiceImpl.java | 10 ++++++++ .../service/impl/TbsCostApplyServiceImpl.java | 23 ++++++++++++++----- 4 files changed, 43 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsCostSubItem.java b/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsCostSubItem.java index a50c821d..52f73f7e 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsCostSubItem.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsCostSubItem.java @@ -3,6 +3,8 @@ package com.qs.serve.modules.tbs.entity.dto; import lombok.AllArgsConstructor; import lombok.Data; +import java.math.BigDecimal; + /** * @author YenHex * @since 2023/5/9 @@ -22,4 +24,11 @@ public class TbsCostSubItem { private String keMuName; } + @Data + @AllArgsConstructor + public static class Amount{ + private BigDecimal budgetAmount; + private BigDecimal preDispatchAmout; + } + } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetCostItemService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetCostItemService.java index 09940af8..3a39f323 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetCostItemService.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetCostItemService.java @@ -25,5 +25,12 @@ public interface TbsBudgetCostItemService extends IService { * @return */ List listByScheduleItemBudgetIds(List ids,Long neInCostApplyId); + + /** + * 根据申请ID查询费用占用 + * @param id + * @return + */ + public List listByCostApplyId(Long costApplyId); } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetCostItemServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetCostItemServiceImpl.java index 05b77a1d..079695db 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetCostItemServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetCostItemServiceImpl.java @@ -44,5 +44,15 @@ public class TbsBudgetCostItemServiceImpl extends ServiceImpl(); } + @Override + public List listByCostApplyId(Long costApplyId) { + if(costApplyId!=null){ + LambdaQueryWrapper costLqw = new LambdaQueryWrapper<>(); + costLqw.eq(TbsBudgetCostItem::getCostApplyId,costApplyId); + return this.list(costLqw); + } + return new ArrayList<>(); + } + } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java index 1016196a..76a08c8e 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java @@ -80,6 +80,8 @@ public class TbsCostApplyServiceImpl extends ServiceImpl tbsBudgetCostItems = budgetCostItemService.listByCostApplyId(Long.parseLong(id)); + List scheduleItemBudgetIds = tbsBudgetCostItems.stream().map(a->a.getScheduleItemBudgetId()).distinct().collect(Collectors.toList()); + List tbsScheduleItemBudgets = tbsScheduleItemBudgetMapper.selectBatchIds(scheduleItemBudgetIds); + for(TbsScheduleItemBudget tbsScheduleItemBudget : tbsScheduleItemBudgets){ + subList.add( + new TbsCostSubItem.Amount( + tbsScheduleItemBudget.getBudgetAmount(),tbsScheduleItemBudget.getPreDispatchAmount() + ) + ); + } + List tbsActivityGoods = tbsActivityGoodsService.listByCostApplyId(Long.parseLong(id)); Set bands = new HashSet<>(); for (TbsActivityGoods tbsActivityGood : tbsActivityGoods) { String band = tbsActivityGood.getTargetLevelPathNames().split("_")[0]; bands.add(band); } + + String goods = bands.stream().collect(Collectors.joining(",")); data.put("chanPinPinLei",goods); data.put("sub",subList);