考核指标分类表

airport-admin/src/main/java/com/sundot/airport/web/controller/system/BasePerformanceIndicatorCategoryController.java

@@ -3,6 +3,8 @@ package com.sundot.airport.web.controller.system;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.sundot.airport.system.domain.BasePerformanceIndicatorCategoryTreeDTO;
+import com.sundot.airport.system.domain.BasePerformanceIndicatorCategoryTreeRequestDTO;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -105,4 +107,14 @@ public class BasePerformanceIndicatorCategoryController extends BaseController {
         List<BasePerformanceIndicatorCategory> list = basePerformanceIndicatorCategoryService.selectBasePerformanceIndicatorCategoryList(basePerformanceIndicatorCategory);
         return success(list);
     }
+
+    /**
+     * 获取分类树及关联指标（支持模糊查询）
+     */
+    @PreAuthorize("@ss.hasPermi('system:performanceIndicatorCategory:list')")
+    @PostMapping("/getCategoryTreeWithIndicatorList")
+    public AjaxResult getCategoryTreeWithIndicatorList(@RequestBody BasePerformanceIndicatorCategoryTreeRequestDTO requestDTO) {
+        List<BasePerformanceIndicatorCategoryTreeDTO> tree = basePerformanceIndicatorCategoryService.getCategoryTreeWithIndicatorList(requestDTO);
+        return AjaxResult.success(tree);
+    }
 }

airport-system/src/main/java/com/sundot/airport/system/domain/BasePerformanceIndicatorCategoryTreeDTO.java

@@ -0,0 +1,107 @@
+package com.sundot.airport.system.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 考核指标分类树及关联指标对象
+ *
+ * @author ruoyi
+ * @date 2026-04-28
+ */
+@Data
+public class BasePerformanceIndicatorCategoryTreeDTO {
+
+    /**
+     * 主键
+     */
+    private Long id;
+    /**
+     * 编码
+     */
+    private String code;
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * 父分类ID
+     */
+    private Long parentId;
+    /**
+     * 祖级列表
+     */
+    private String ancestors;
+    /**
+     * 排序
+     */
+    private Integer orderNum;
+    /**
+     * 层级
+     */
+    private Integer level;
+    /**
+     * 创建者
+     */
+    private String createBy;
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    /**
+     * 更新者
+     */
+    private String updateBy;
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 子分类列表
+     */
+    private List<BasePerformanceIndicatorCategoryTreeDTO> children = new ArrayList<>();
+    /**
+     * 当前分类下的指标列表
+     */
+    private List<BasePerformanceIndicator> indicatorList = new ArrayList<>();
+
+    /**
+     * 转换为DTO
+     *
+     * @param entity
+     * @return
+     */
+    public static BasePerformanceIndicatorCategoryTreeDTO fromEntity(BasePerformanceIndicatorCategory entity) {
+        if (entity == null) {
+            return null;
+        }
+        BasePerformanceIndicatorCategoryTreeDTO dto = new BasePerformanceIndicatorCategoryTreeDTO();
+        dto.setId(entity.getId());
+        dto.setCode(entity.getCode());
+        dto.setName(entity.getName());
+        dto.setParentId(entity.getParentId());
+        dto.setAncestors(entity.getAncestors());
+        dto.setOrderNum(entity.getOrderNum());
+        dto.setLevel(entity.getLevel());
+        dto.setCreateBy(entity.getCreateBy());
+        dto.setCreateTime(entity.getCreateTime());
+        dto.setUpdateBy(entity.getUpdateBy());
+        dto.setUpdateTime(entity.getUpdateTime());
+        dto.setRemark(entity.getRemark());
+        return dto;
+    }
+
+}

airport-system/src/main/java/com/sundot/airport/system/domain/BasePerformanceIndicatorCategoryTreeRequestDTO.java

@@ -0,0 +1,25 @@
+package com.sundot.airport.system.domain;
+
+import lombok.Data;
+
+/**
+ * 考核指标分类树及关联指标查询请求参数
+ *
+ * @author ruoyi
+ * @date 2026-04-28
+ */
+@Data
+public class BasePerformanceIndicatorCategoryTreeRequestDTO {
+    /**
+     * 分类编码
+     */
+    private String categoryCode;
+    /**
+     * 分类名称
+     */
+    private String categoryName;
+    /**
+     * 指标名称
+     */
+    private String indicatorName;
+}

airport-system/src/main/java/com/sundot/airport/system/service/IBasePerformanceIndicatorCategoryService.java

@@ -3,6 +3,8 @@ package com.sundot.airport.system.service;
 import java.util.List;
 
 import com.sundot.airport.system.domain.BasePerformanceIndicatorCategory;
+import com.sundot.airport.system.domain.BasePerformanceIndicatorCategoryTreeDTO;
+import com.sundot.airport.system.domain.BasePerformanceIndicatorCategoryTreeRequestDTO;
 
 /**
  * 考核指标分类Service接口
@@ -74,4 +76,12 @@ public interface IBasePerformanceIndicatorCategoryService {
      * @return 树结构列表
      */
     public List<BasePerformanceIndicatorCategory> buildTree(List<BasePerformanceIndicatorCategory> list);
+
+    /**
+     * 获取分类树及关联指标（支持模糊查询）
+     *
+     * @param requestDTO 入参
+     * @return 树结构列表
+     */
+    public List<BasePerformanceIndicatorCategoryTreeDTO> getCategoryTreeWithIndicatorList(BasePerformanceIndicatorCategoryTreeRequestDTO requestDTO);
 }

airport-system/src/main/java/com/sundot/airport/system/service/impl/BasePerformanceIndicatorCategoryServiceImpl.java

@@ -1,14 +1,22 @@
 package com.sundot.airport.system.service.impl;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.sundot.airport.common.config.LevelConfig;
 import com.sundot.airport.common.exception.ServiceException;
 import com.sundot.airport.common.utils.DateUtils;
+import com.sundot.airport.system.domain.BasePerformanceIndicator;
+import com.sundot.airport.system.domain.BasePerformanceIndicatorCategoryTreeDTO;
+import com.sundot.airport.system.domain.BasePerformanceIndicatorCategoryTreeRequestDTO;
+import com.sundot.airport.system.service.IBasePerformanceIndicatorService;
 import com.sundot.airport.system.utils.CodeGeneratorUtil;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +41,8 @@ public class BasePerformanceIndicatorCategoryServiceImpl implements IBasePerform
     private LevelConfig levelConfig;
     @Autowired
     private CodeGeneratorUtil codeGeneratorUtil;
+    @Autowired
+    private IBasePerformanceIndicatorService basePerformanceIndicatorService;
 
     /**
      * 查询考核指标分类
@@ -208,4 +218,101 @@ public class BasePerformanceIndicatorCategoryServiceImpl implements IBasePerform
             throw new ServiceException("操作失败,层级超过限制" + levelConfig.getPerformanceIndicatorCategoryLevel() + "级");
         }
     }
+
+    /**
+     * 获取分类树及关联指标（支持模糊查询）
+     *
+     * @param requestDTO 入参
+     * @return 树结构列表
+     */
+    @Override
+    public List<BasePerformanceIndicatorCategoryTreeDTO> getCategoryTreeWithIndicatorList(BasePerformanceIndicatorCategoryTreeRequestDTO requestDTO) {
+
+        // 1. 查询所有分类
+        List<BasePerformanceIndicatorCategory> allCategorieList = basePerformanceIndicatorCategoryMapper.selectBasePerformanceIndicatorCategoryList(new BasePerformanceIndicatorCategory());
+
+        // 2. 查询指标（支持指标名称模糊匹配）
+        BasePerformanceIndicator indicator = new BasePerformanceIndicator();
+        indicator.setName(requestDTO.getIndicatorName());
+        List<BasePerformanceIndicator> indicatorList = basePerformanceIndicatorService.selectBasePerformanceIndicatorList(indicator);
+
+        // 3. 按分类编码分组指标
+        Map<String, List<BasePerformanceIndicator>> indicatorMap = indicatorList.stream().collect(Collectors.groupingBy(BasePerformanceIndicator::getCategoryCode));
+
+        // 4. 转换为DTO并绑定指标
+        Map<Long, BasePerformanceIndicatorCategoryTreeDTO> dtoMap = new HashMap<>();
+        for (BasePerformanceIndicatorCategory category : allCategorieList) {
+            BasePerformanceIndicatorCategoryTreeDTO dto = BasePerformanceIndicatorCategoryTreeDTO.fromEntity(category);
+            List<BasePerformanceIndicator> list = indicatorMap.get(category.getCode());
+            dto.setIndicatorList(list != null ? list : Collections.emptyList());
+            dtoMap.put(dto.getId(), dto);
+        }
+
+        // 5. 构建树形结构
+        List<BasePerformanceIndicatorCategoryTreeDTO> rootList = new ArrayList<>();
+        for (BasePerformanceIndicatorCategoryTreeDTO dto : dtoMap.values()) {
+            Long parentId = dto.getParentId();
+            if (parentId == null || parentId == 0) {
+                rootList.add(dto);
+            } else {
+                BasePerformanceIndicatorCategoryTreeDTO parent = dtoMap.get(parentId);
+                if (parent != null) {
+                    parent.getChildren().add(dto);
+                }
+            }
+        }
+
+        // 6. 递归过滤（分类条件 + 指标条件）
+        List<BasePerformanceIndicatorCategoryTreeDTO> filteredRootList = filterTree(rootList, requestDTO);
+
+        // 7. 排序
+        sortChildren(filteredRootList);
+
+        return filteredRootList;
+    }
+
+    /**
+     * 递归过滤树节点
+     */
+    private List<BasePerformanceIndicatorCategoryTreeDTO> filterTree(List<BasePerformanceIndicatorCategoryTreeDTO> nodeList, BasePerformanceIndicatorCategoryTreeRequestDTO requestDTO) {
+        List<BasePerformanceIndicatorCategoryTreeDTO> result = new ArrayList<>();
+        for (BasePerformanceIndicatorCategoryTreeDTO node : nodeList) {
+            boolean selfMatch = matchesCategory(node, requestDTO);
+            List<BasePerformanceIndicatorCategoryTreeDTO> filteredChildren = filterTree(node.getChildren(), requestDTO);
+
+            // 保留条件：自身匹配 或 子节点有匹配
+            if (selfMatch || !filteredChildren.isEmpty()) {
+                node.setChildren(filteredChildren);
+                result.add(node);
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 匹配分类
+     */
+    private boolean matchesCategory(BasePerformanceIndicatorCategoryTreeDTO dto, BasePerformanceIndicatorCategoryTreeRequestDTO requestDTO) {
+        boolean match = true;
+        if (StrUtil.isNotBlank(requestDTO.getCategoryCode())) {
+            match = match && requestDTO.getCategoryCode().equals(dto.getCode());
+        }
+        if (StrUtil.isNotBlank(requestDTO.getCategoryName())) {
+            match = match && StrUtil.containsIgnoreCase(dto.getName(), requestDTO.getCategoryName());
+        }
+        return match;
+    }
+
+    /**
+     * 排序子节点
+     */
+    private void sortChildren(List<BasePerformanceIndicatorCategoryTreeDTO> list) {
+        if (list == null) {
+            return;
+        }
+        list.sort(Comparator.comparing(BasePerformanceIndicatorCategoryTreeDTO::getOrderNum, Comparator.nullsLast(Integer::compareTo)));
+        for (BasePerformanceIndicatorCategoryTreeDTO dto : list) {
+            sortChildren(dto.getChildren());
+        }
+    }
 }