费用率，添加政策ID查询

src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java

@@ -147,8 +147,8 @@ public class BirRoiRateController {
      */
     @RepeatSubmit
     @GetMapping("/centerRateByCostApplyId")
-    public R<List<TbsCostSubItem.CostCenterTranStr>> centerRateByCostApplyId(Long id){
+    public R<List<TbsCostSubItem.CostCenterTranStr>> centerRateByCostApplyId(Long costApplyId,Long policyId){
-        return R.ok(birCenterRateService.findCostCenterDataByCostApplyId(id));
+        return R.ok(birCenterRateService.findCostCenterDataByCostApplyId(costApplyId,policyId));
     }
 
 

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<TbsCostSubItem.CostCenterTranStr> findCostCenterDataByCostApplyId(Long id);
+    List<TbsCostSubItem.CostCenterTranStr> findCostCenterDataByCostApplyId(Long costApplyId,Long policyId);
 }

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.*;
-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.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<TbsCostSubItem.CostCenterTranStr> findCostCenterDataByCostApplyId(Long id){
+    public List<TbsCostSubItem.CostCenterTranStr> findCostCenterDataByCostApplyId(Long costApplyId,Long policyId){
         List<TbsCostSubItem.CostCenterTranStr> centerDataList = new ArrayList<>();
-
+        if(costApplyId!=null) {
-        LambdaQueryWrapper<TbsActivityCenter> lqw = new LambdaQueryWrapper<>();
+            LambdaQueryWrapper<TbsActivityCenter> lqw = new LambdaQueryWrapper<>();
-        lqw.eq(TbsActivityCenter::getCostApplyId,id);
+            lqw.eq(TbsActivityCenter::getCostApplyId, costApplyId);
-        List<TbsActivityCenter> tbsActivityCenters = tbsActivityCenterMapper.selectList(lqw);
+            List<TbsActivityCenter> tbsActivityCenters = tbsActivityCenterMapper.selectList(lqw);
-        if(tbsActivityCenters.size()==0){
+            if (tbsActivityCenters.size() == 0) {
-            return centerDataList;
+                return centerDataList;
+            }
+
+            Map<String, List<TbsActivityCenter>> centerMapList = tbsActivityCenters.stream().collect(Collectors.groupingBy(a -> a.getCenterType() + "-" + a.getCenterId()));
+            List<TbsActivityCenter> 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);
+            }
         }
-
+        if(policyId!=null) {
-        Map<String,List<TbsActivityCenter>> centerMapList = tbsActivityCenters.stream().collect(Collectors.groupingBy(a->a.getCenterType()+"-"+a.getCenterId()));
+            LambdaQueryWrapper<TzcPolicyItem> lqw = new LambdaQueryWrapper<>();
-        List<TbsActivityCenter> centerList = centerMapList.values().stream().map(a->a.get(0)).collect(Collectors.toList());
+            lqw.eq(TzcPolicyItem::getPolicyId,policyId);
-
+            List<TzcPolicyItem> policyItems = tzcPolicyItemMapper.selectList(lqw);
-        for(TbsActivityCenter center : centerList) {
+            Map<String, List<TzcPolicyItem>> centerMapList = policyItems.stream().collect(Collectors.groupingBy(a -> a.getCenterType() + "-" + a.getCenterId()));
-            TbsCostSubItem.CostCenterTranStr costCenter = this.buildCostCenter(center.getCenterType(), center.getCenterId(), center.getCenterName());
+            List<TzcPolicyItem> centerList = centerMapList.values().stream().map(a -> a.get(0)).collect(Collectors.toList());
-            costCenter.setCenterId(center.getCenterId());
+            for(TzcPolicyItem center : centerList) {
-            costCenter.setCentertype(center.getCenterType());
+                TbsCostSubItem.CostCenterTranStr costCenter = this.buildCostCenter(center.getCenterType(), center.getCenterId(), center.getCenterName());
-            centerDataList.add(costCenter);
+                costCenter.setCenterId(center.getCenterId());
+                costCenter.setCentertype(center.getCenterType());
+                costCenter.setCenterCode(center.getCenterCode());
+                centerDataList.add(costCenter);
+            }
         }
+
         return centerDataList;
     }
 

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;
 
         //区域预算,预算金额