载体添加主导产业筛选

src/main/java/com/postcard/service/moudle/carrier/mapper/CarrierInfoMapper.java

@@ -8,6 +8,8 @@ import com.postcard.service.moudle.carrier.vo.CarrierPageVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * @author: zhouxudong
  * @version:  1.0
@@ -18,6 +20,7 @@ import org.apache.ibatis.annotations.Param;
 public interface CarrierInfoMapper extends BaseMapper<CarrierInfo> {
 
     Page<CarrierPageVo> pageList(Page page, @Param("param") CarrierPageDto carrierPageDto);
+    List<CarrierPageVo> pageList(@Param("param") CarrierPageDto carrierPageDto);
 }
 
 

src/main/java/com/postcard/service/moudle/carrier/service/CarrierInfoService.java

@@ -8,6 +8,8 @@ import com.postcard.service.moudle.carrier.entity.CarrierInfo;
 import com.postcard.service.moudle.carrier.vo.CarrierDetailVo;
 import com.postcard.service.moudle.carrier.vo.CarrierPageVo;
 
+import java.util.List;
+
 /**
  * @author: zhouxudong
  * @version:  1.0
@@ -23,6 +25,15 @@ public interface CarrierInfoService extends IService<CarrierInfo> {
      * @return: com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.lyy.admin.moudle.carrier.vo.CarrierPageVo>
      **/
     Page<CarrierPageVo> pageList(ParamEntity<CarrierPageDto> carrierPageDto);
+
+
+    /**
+     * @description: 不分页载体信息
+     * @date: 2023/11/23 17:58
+     * @param: [carrierPageDto]
+     * @return: com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.lyy.admin.moudle.carrier.vo.CarrierPageVo>
+     **/
+    List<CarrierPageVo> list(CarrierPageDto carrierPageDto);
     /**
      * @description: 详情
      * @date: 2023/11/23 17:58

src/main/java/com/postcard/service/moudle/carrier/service/impl/CarrierInfoServiceImpl.java

@@ -112,6 +112,63 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
     return result;
   }
 
+  /**
+   * @description: 全部列表查询
+   * @date: 2023/11/23 14:47
+   * @param: [carrierPageDto]
+   * @return:
+   *     com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.lyy.admin.moudle.carrier.vo.CarrierPageVo>
+   */
+  @Override
+  public List<CarrierPageVo>  list(CarrierPageDto carrierPageDto) {
+    String carrierArea = carrierPageDto.getCarrierArea();
+    if (StringUtils.isNotBlank(carrierArea)) {
+      String[] split = carrierArea.split("-");
+      carrierPageDto.setLowCarrierArea(Double.valueOf(split[0]));
+      if (split.length > 1) {
+        carrierPageDto.setHighCarrierArea(Double.valueOf(split[1]));
+      }
+    }
+    // 映射字段
+    String carrierType = carrierPageDto.getTypeInfo();
+    if (StringUtils.isNotBlank(carrierType)) {
+      Map<String, SysDictDataEntity> dictDataEntityMap =
+              this.sysDictDataService.listByCode(DictCodeEnum.CARRIER_TYPE.getCode());
+      SysDictDataEntity sysDictDataEntity = dictDataEntityMap.get(carrierType);
+      if (ObjectUtils.isNotEmpty(sysDictDataEntity)) {
+        String detail = sysDictDataEntity.getDetail();
+        carrierPageDto.setCarrierType(Arrays.asList(detail.split(",")));
+      }
+    }
+    //主导产业
+    if(org.apache.commons.lang3.StringUtils.isNotBlank(carrierPageDto.getPrimaryIndustry())){
+      String name = PrimaryIndustryEnum.getName(carrierPageDto.getPrimaryIndustry());
+      String[] split = name.split("、");
+      carrierPageDto.setPrimaryIndustryList(Arrays.asList(split));
+    }
+    carrierPageDto.setDevelopmentId(developMentId);
+    List<CarrierPageVo> records = this.baseMapper.pageList(carrierPageDto);
+    if (!CollectionUtils.isEmpty(records)) {
+      records.forEach(
+              data -> {
+                StringJoiner sj = new StringJoiner("");
+                String provinceName = data.getProvinceName();
+                String cityName = data.getCityName();
+                Double area = data.getArea();
+                String name =
+                        sj.add(DataUtil.dealProvince(provinceName, cityName))
+                                .add(ObjectUtils.isEmpty(data.getRegionName())?"":data.getRegionName())
+                                .add(ObjectUtils.isEmpty(data.getParkName())?"":data.getParkName())
+                                .add(ObjectUtils.isEmpty(area) ? "" : NumberUtil.roundStr(area, 0) + "㎡")
+                                .add(ObjectUtils.isEmpty(data.getType())?"":data.getParkName())
+                                .toString();
+                name = name.replace("null", "");
+                data.setName(name);
+              });
+    }
+    return records;
+  }
+
   /**
    * @description: 详情
    * @date: 2023/12/16 15:05

src/main/java/com/postcard/service/moudle/development/service/impl/DevelopmentInfoServiceImpl.java

@@ -9,6 +9,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.postcard.service.enums.CarouselTypeEnum;
 import com.postcard.service.enums.StatusEnum;
+import com.postcard.service.moudle.carrier.dto.CarrierPageDto;
+import com.postcard.service.moudle.carrier.service.CarrierInfoService;
 import com.postcard.service.moudle.carrier.vo.CarrierInvestmentVo;
 import com.postcard.service.moudle.development.entity.DevelopmentIndustryPolicyInfo;
 import com.postcard.service.moudle.development.entity.DevelopmentInfo;
@@ -73,6 +75,8 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
   @Autowired StarObjectExtensionInfoService starObjectExtensionInfoService;
   @Autowired ScSourceInfoService scSourceInfoService;
 
+  @Autowired CarrierInfoService carrierInfoService;
+
   @Value("${development.id}")
   private Integer developMentId;
 
@@ -159,7 +163,19 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
     //产业情况 区域亮点
     Map<String, List<StarObjectExtensionInfoVO>> detail = starObjectExtensionInfoService.detail(developMentId);
     developmentDetailVo.setInvestmentLights(detail.get(FactorCostEnum.LIGHT.getName()));
+
+    List<StarObjectExtensionInfoVO> starObjectExtensionInfoVOS = detail.get(FactorCostEnum.INDUSRTY.getName());
+    starObjectExtensionInfoVOS.forEach(e->{
+      CarrierPageDto carrierPageDto = new CarrierPageDto();
+      carrierPageDto.setDevelopmentId(developMentId);
+      carrierPageDto.setPrimaryIndustry(e.getTitle());
+      e.setCarrirList(carrierInfoService.list(carrierPageDto));
+    });
+
     developmentDetailVo.setPrimaryIndustrys(detail.get(FactorCostEnum.INDUSRTY.getName()));
+
+
+
     //要素成本
     LambdaQueryWrapper<ScSourceInfoEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
     lambdaQueryWrapper.eq(ScSourceInfoEntity::getDevelopmentId,developMentId);

src/main/java/com/postcard/service/moudle/startObjectExtensionInfo/VO/StarObjectExtensionInfoVO.java

 package com.postcard.service.moudle.startObjectExtensionInfo.VO;
 
+import com.postcard.service.moudle.carrier.vo.CarrierPageVo;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 
@@ -28,5 +30,10 @@ public class StarObjectExtensionInfoVO implements Serializable {
      */
     private String titleIntroduce;
 
+    /**
+     * 介绍
+     */
+    private List<CarrierPageVo> carrirList;
+
 
 }
\ No newline at end of file