园区载体信息 类型返回

src/main/java/com/lyy/admin/VO/ParkInfoAllVO.java

 package com.lyy.admin.VO;
 
 import cn.hutool.json.JSONArray;
+import com.lyy.admin.domain.carrierinfo.CarrierInfo;
 import com.lyy.admin.domain.parkinfo.ParkCarrierInfo;
 import com.lyy.admin.domain.parkinfo.ParkInvestmentDirectionInfo;
 import com.lyy.admin.domain.parkinfo.ParkSewageInfo;

src/main/java/com/lyy/admin/service/parkinfo/impl/ParkInfoServiceImpl.java

@@ -326,9 +326,11 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
             LambdaQueryWrapper<CarrierInfo> CIQuery = new LambdaQueryWrapper<>();
             CIQuery.eq(CarrierInfo::getParkId, id);
             List<CarrierInfo> list = carrierInfoService.list(CIQuery);
-            List<CarrierInfoTypeListVO> carrierInfoVOS = Convert.toList(CarrierInfoTypeListVO.class, list);
-            List<CarrierInfoTypeListVO> collect = carrierInfoVOS.stream().distinct().collect(Collectors.toList());
-            parkInfoAllVO.setCarrierInfoVO(collect);
+            List<CarrierInfo> collect = list.stream().
+                    collect(Collectors.collectingAndThen(
+                    Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(CarrierInfo::getType))), ArrayList::new));
+            List<CarrierInfoTypeListVO> carrierInfoVOS = Convert.toList(CarrierInfoTypeListVO.class, collect);
+            parkInfoAllVO.setCarrierInfoVO(carrierInfoVOS);
             //获取污水处理能力信息
             QueryWrapper<ParkSewageInfo> PSIWrapper = new QueryWrapper<>();
             PSIWrapper.eq("park_id", id);