各类别绩效评估-技术应用绩效-列表查询接口(入参项目类别)

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/AreaInfoController.java

@@ -59,6 +59,9 @@ public class AreaInfoController extends BaseController {
         ExcelUtil.exportExcel(list, "区域信息", AreaInfoVo.class, response);
     }
 
+    /**
+     * 获取区域信息列表+AI描述
+     */
     @GetMapping("/getList")
     public R<List<AreaInfoFinalVo>> getList(AreaInfoBo bo) {
         List<AreaInfoFinalVo> rs = areaInfoService.getList(bo);

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/ProjectInfoController.java

@@ -129,4 +129,17 @@ public class ProjectInfoController extends BaseController {
         achievements.add("“十三五”：新建再生水厂工程；分别完成排水和再生水管网建设719和123公里；完成30余条河沟水环境整治；新建修缮农村污水处理设施533座。");
         return achievements;
     }
+
+
+    /**
+     * 查询项目信息 (不分页)
+     * @param bo
+     * @return
+     */
+    @GetMapping("/getInfoList")
+    public R< List<ProjectInfoVo>> getInfoList(ProjectInfoBo bo) {
+        List<ProjectInfoVo> rs = projectInfoService.queryList(bo);
+        return R.ok(rs);
+    }
+
 }

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/AreaInfoServiceImpl.java

@@ -1,5 +1,6 @@
 package org.dromara.demo.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -139,22 +140,26 @@ public class AreaInfoServiceImpl implements IAreaInfoService {
 
     @Override
     public List<AreaInfoFinalVo> getList(AreaInfoBo bo) {
-        String des = "从“九五~十三五”期间，XX区实际实施项目208项，其中完工168项。累计完成总投资为199.38亿元。\n" +
+        String des = "从“九五~十三五”期间，XX区实际实施项目208项，其中完工168项。累计完成总投资为199.38亿元。" +
             "累积完成4座污水处理厂新建与扩建，新建8座调蓄池；管道建设641.45km；河道清淤14.86万m3；生态修复2193.96亩。";
 
         // 从数据库中获取的所有区域信息
         List<AreaInfoVo> areaInfoVos = this.queryList(bo);
 
-        // 按 district（区域）分组
-        Map<String, List<AreaInfoVo>> groupedByDistrict = areaInfoVos.stream()
-            .collect(Collectors.groupingBy(AreaInfoVo::getDistrict));
+        if (CollectionUtil.isNotEmpty(areaInfoVos)){
+            // 按 district（区域）分组
+            Map<String, List<AreaInfoVo>> groupedByDistrict = areaInfoVos.stream()
+                .collect(Collectors.groupingBy(AreaInfoVo::getDistrict));
 
-        // 转换为 List<AreaInfoFinalVo>
-        List<AreaInfoFinalVo> result = new ArrayList<>();
-        for (Map.Entry<String, List<AreaInfoVo>> entry : groupedByDistrict.entrySet()) {
-            result.add(new AreaInfoFinalVo(entry.getValue(), des)); // description 先为 null
-        }
+            // 转换为 List<AreaInfoFinalVo>
+            // TODO 各区AI描述待提供
+            List<AreaInfoFinalVo> result = new ArrayList<>();
+            for (Map.Entry<String, List<AreaInfoVo>> entry : groupedByDistrict.entrySet()) {
+                result.add(new AreaInfoFinalVo(entry.getValue(), des)); // description 先为默认
+            }
 
-        return result;
+            return result;
+        }
+        return new ArrayList<>();
     }
 }

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ProjectInfoServiceImpl.java

@@ -85,7 +85,7 @@ public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, Proje
         lqw.eq(StringUtils.isNotBlank(bo.getDistrict()), ProjectInfo::getDistrict, bo.getDistrict());
         lqw.eq(StringUtils.isNotBlank(bo.getControlArea()), ProjectInfo::getControlArea, bo.getControlArea());
         lqw.eq(StringUtils.isNotBlank(bo.getRiverBasin()), ProjectInfo::getRiverBasin, bo.getRiverBasin());
-        lqw.eq(StringUtils.isNotBlank(bo.getProjectTypeList()), ProjectInfo::getProjectTypeList, bo.getProjectTypeList());
+        lqw.like(StringUtils.isNotBlank(bo.getProjectTypeList()), ProjectInfo::getProjectTypeList, bo.getProjectTypeList());
         lqw.eq(StringUtils.isNotBlank(bo.getProjectTech()), ProjectInfo::getProjectTech, bo.getProjectTech());
         lqw.like(StringUtils.isNotBlank(bo.getTechName()), ProjectInfo::getTechName, bo.getTechName());
         lqw.eq(StringUtils.isNotBlank(bo.getTechCost()), ProjectInfo::getTechCost, bo.getTechCost());