载体添加主导产业筛选

src/main/java/com/postcard/service/moudle/carrier/dto/CarrierPageDto.java

@@ -47,5 +47,11 @@ public class CarrierPageDto {
   @ApiModelProperty(hidden = true)
   private Integer parkId;
 
+  //主导产业
+  @ApiModelProperty(value = "主导产业")
+  private String primaryIndustry;
+  @ApiModelProperty(hidden = true)
+  private List<String> primaryIndustryList;
+
 
 }

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

@@ -17,6 +17,7 @@ import com.postcard.service.moudle.carrier.vo.CarrierInvestmentVo;
 import com.postcard.service.moudle.carrier.vo.CarrierPageVo;
 import com.postcard.service.moudle.carrier.vo.CarrierParkVo;
 import com.postcard.service.moudle.park.entity.ParkInfo;
+import com.postcard.service.moudle.park.enums.PrimaryIndustryEnum;
 import com.postcard.service.moudle.park.service.ParkInfoService;
 import com.postcard.service.moudle.system.entity.SysDictDataEntity;
 import com.postcard.service.moudle.system.service.SysCarouselInfoService;
@@ -80,6 +81,12 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
         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));
+    }
     Page page = CommonUtil.getPageFromEntity(paramEntity);
     carrierPageDto.setDevelopmentId(developMentId);
     Page<CarrierPageVo> result = this.baseMapper.pageList(page, carrierPageDto);
@@ -93,10 +100,10 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
             Double area = data.getArea();
             String name =
                 sj.add(DataUtil.dealProvince(provinceName, cityName))
-                    .add(data.getRegionName())
-                    .add(data.getParkName())
+                    .add(ObjectUtils.isEmpty(data.getRegionName())?"":data.getRegionName())
+                    .add(ObjectUtils.isEmpty(data.getParkName())?"":data.getParkName())
                     .add(ObjectUtils.isEmpty(area) ? "" : NumberUtil.roundStr(area, 0) + "㎡")
-                    .add(data.getType())
+                    .add(ObjectUtils.isEmpty(data.getType())?"":data.getParkName())
                     .toString();
             name = name.replace("null", "");
             data.setName(name);
@@ -104,6 +111,7 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
     }
     return result;
   }
+
   /**
    * @description: 详情
    * @date: 2023/12/16 15:05

src/main/resources/mapper/carrier/CarrierInfoMapper.xml

@@ -65,6 +65,11 @@
             <if test="param.parkId != null and param.parkId != ''">
                 AND a.park_id = #{param.parkId}
             </if>
+            <if test="param.primaryIndustryList != null and param.primaryIndustryList.size() > 0 ">
+                <foreach item="primaryIndustry" collection="param.primaryIndustryList" open=" and ( " separator="or" close=")">
+                    b.primary_industry like concat('%', #{primaryIndustry}, '%')
+                </foreach>
+            </if>
         </where>
         order by a.create_time desc
     </select>