From 1dae6e80eecfe1cf1017f971571c4be5f82e2cd7 Mon Sep 17 00:00:00 2001 From: "15989082884@163.com" <15989082884@163.com> Date: Mon, 24 Jul 2023 17:58:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E7=8E=87=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=94=BF=E7=AD=96ID=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bir/controller/BirRoiRateController.java | 4 +- .../bir/service/BirCenterRateService.java | 2 +- .../impl/BirCenterRateServiceImpl.java | 56 ++++++++++++------- .../tbs/entity/dto/TbsCostSubItem.java | 1 + 4 files changed, 40 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java b/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java index 8c671949..09f2f9db 100644 --- a/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java +++ b/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java @@ -147,8 +147,8 @@ public class BirRoiRateController { */ @RepeatSubmit @GetMapping("/centerRateByCostApplyId") - public R> centerRateByCostApplyId(Long id){ - return R.ok(birCenterRateService.findCostCenterDataByCostApplyId(id)); + public R> centerRateByCostApplyId(Long costApplyId,Long policyId){ + return R.ok(birCenterRateService.findCostCenterDataByCostApplyId(costApplyId,policyId)); } diff --git a/src/main/java/com/qs/serve/modules/bir/service/BirCenterRateService.java b/src/main/java/com/qs/serve/modules/bir/service/BirCenterRateService.java index 9baeac30..e25788e0 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/BirCenterRateService.java +++ b/src/main/java/com/qs/serve/modules/bir/service/BirCenterRateService.java @@ -7,5 +7,5 @@ import java.util.List; public interface BirCenterRateService { TbsCostSubItem.CostCenterTranStr buildCostCenter(String centerType, String centerId, String centerName); - List findCostCenterDataByCostApplyId(Long id); + List findCostCenterDataByCostApplyId(Long costApplyId,Long policyId); } diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java index 087f044c..c0560363 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java @@ -23,14 +23,13 @@ import com.qs.serve.modules.bms.mapper.BmsSupplierMapper; import com.qs.serve.modules.erp.entity.dto.ErpDispatchSumVo; import com.qs.serve.modules.erp.mapper.ErpDispatchDataMapper; import com.qs.serve.modules.tbs.common.util.QuarterUtil; -import com.qs.serve.modules.tbs.entity.TbsActivityCenter; -import com.qs.serve.modules.tbs.entity.TbsBudget; -import com.qs.serve.modules.tbs.entity.TbsCostApply; -import com.qs.serve.modules.tbs.entity.TbsScheduleItemBudget; +import com.qs.serve.modules.tbs.entity.*; import com.qs.serve.modules.tbs.entity.dto.TbsCostSubItem; import com.qs.serve.modules.tbs.mapper.TbsActivityCenterMapper; import com.qs.serve.modules.tbs.mapper.TbsBudgetMapper; import com.qs.serve.modules.tbs.mapper.TbsScheduleItemBudgetMapper; +import com.qs.serve.modules.tzc.entity.TzcPolicyItem; +import com.qs.serve.modules.tzc.mapper.TzcPolicyItemMapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -58,27 +57,44 @@ public class BirCenterRateServiceImpl implements BirCenterRateService { private final ErpDispatchDataMapper dispatchDataMapper; private BirActivityCenterGoodsMapper birActivityCenterGoodsMapper; private TbsActivityCenterMapper tbsActivityCenterMapper; + private TzcPolicyItemMapper tzcPolicyItemMapper; - public List findCostCenterDataByCostApplyId(Long id){ + public List findCostCenterDataByCostApplyId(Long costApplyId,Long policyId){ List centerDataList = new ArrayList<>(); - - LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); - lqw.eq(TbsActivityCenter::getCostApplyId,id); - List tbsActivityCenters = tbsActivityCenterMapper.selectList(lqw); - if(tbsActivityCenters.size()==0){ - return centerDataList; + if(costApplyId!=null) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(TbsActivityCenter::getCostApplyId, costApplyId); + List tbsActivityCenters = tbsActivityCenterMapper.selectList(lqw); + if (tbsActivityCenters.size() == 0) { + return centerDataList; + } + + Map> centerMapList = tbsActivityCenters.stream().collect(Collectors.groupingBy(a -> a.getCenterType() + "-" + a.getCenterId())); + List centerList = centerMapList.values().stream().map(a -> a.get(0)).collect(Collectors.toList()); + for(TbsActivityCenter center : centerList) { + TbsCostSubItem.CostCenterTranStr costCenter = this.buildCostCenter(center.getCenterType(), center.getCenterId(), center.getCenterName()); + costCenter.setCenterId(center.getCenterId()); + costCenter.setCentertype(center.getCenterType()); + costCenter.setCenterCode(center.getCenterCode()); + centerDataList.add(costCenter); + } } - - Map> centerMapList = tbsActivityCenters.stream().collect(Collectors.groupingBy(a->a.getCenterType()+"-"+a.getCenterId())); - List centerList = centerMapList.values().stream().map(a->a.get(0)).collect(Collectors.toList()); - - for(TbsActivityCenter center : centerList) { - TbsCostSubItem.CostCenterTranStr costCenter = this.buildCostCenter(center.getCenterType(), center.getCenterId(), center.getCenterName()); - costCenter.setCenterId(center.getCenterId()); - costCenter.setCentertype(center.getCenterType()); - centerDataList.add(costCenter); + if(policyId!=null) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(TzcPolicyItem::getPolicyId,policyId); + List policyItems = tzcPolicyItemMapper.selectList(lqw); + Map> centerMapList = policyItems.stream().collect(Collectors.groupingBy(a -> a.getCenterType() + "-" + a.getCenterId())); + List centerList = centerMapList.values().stream().map(a -> a.get(0)).collect(Collectors.toList()); + for(TzcPolicyItem center : centerList) { + TbsCostSubItem.CostCenterTranStr costCenter = this.buildCostCenter(center.getCenterType(), center.getCenterId(), center.getCenterName()); + costCenter.setCenterId(center.getCenterId()); + costCenter.setCentertype(center.getCenterType()); + costCenter.setCenterCode(center.getCenterCode()); + centerDataList.add(costCenter); + } } + return centerDataList; } 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 aeb44329..db72568e 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 @@ -107,6 +107,7 @@ public class TbsCostSubItem { private String chengBenZhongXin; private String chengBenZhongXinId; private String centertype; + private String centerCode; private String centerId; //区域预算,预算金额