考核指标表

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

@@ -3,6 +3,7 @@ package com.sundot.airport.web.controller.system;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.sundot.airport.blocked.domain.BlockedRate;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,12 +21,14 @@ import com.sundot.airport.common.enums.BusinessType;
 import com.sundot.airport.system.domain.BasePerformanceIndicator;
 import com.sundot.airport.system.service.IBasePerformanceIndicatorService;
 import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 考核指标Controller
  *
  * @author ruoyi
- * @date 2026-04-20
+ * @date 2026-04-28
  */
 @RestController
 @RequestMapping("/system/indicator")
@@ -38,9 +41,10 @@ public class BasePerformanceIndicatorController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:indicator:list')")
     @GetMapping("/list")
-    public AjaxResult list(BasePerformanceIndicator basePerformanceIndicator) {
+    public TableDataInfo list(BasePerformanceIndicator basePerformanceIndicator) {
+        startPage();
         List<BasePerformanceIndicator> list = basePerformanceIndicatorService.selectBasePerformanceIndicatorList(basePerformanceIndicator);
-        return success(list);
+        return getDataTable(list);
     }
 
     /**
@@ -56,6 +60,28 @@ public class BasePerformanceIndicatorController extends BaseController {
     }
 
     /**
+     * 导入考核指标列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:indicator:import')")
+    @Log(title = "导入考核指标列表", businessType = BusinessType.IMPORT)
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
+        ExcelUtil<BasePerformanceIndicator> util = new ExcelUtil<>(BasePerformanceIndicator.class);
+        List<BasePerformanceIndicator> list = util.importExcel(file.getInputStream());
+        String message = basePerformanceIndicatorService.importData(list, updateSupport);
+        return success(message);
+    }
+
+    /**
+     * 获取导入模板
+     */
+    @PostMapping("/importTemplate")
+    public void importTemplate(HttpServletResponse response) {
+        ExcelUtil<BlockedRate> util = new ExcelUtil<>(BlockedRate.class);
+        util.importTemplateExcel(response, "考核指标数据导入模板");
+    }
+
+    /**
      * 获取考核指标详细信息
      */
     @PreAuthorize("@ss.hasPermi('system:indicator:query')")
@@ -95,14 +121,4 @@ public class BasePerformanceIndicatorController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(basePerformanceIndicatorService.deleteBasePerformanceIndicatorByIds(ids));
     }
-
-    /**
-     * 查询考核指标列表树形结构
-     */
-    @PreAuthorize("@ss.hasPermi('system:indicator:list')")
-    @GetMapping("/listTree")
-    public AjaxResult listTree(BasePerformanceIndicator basePerformanceIndicator) {
-        List<BasePerformanceIndicator> list = basePerformanceIndicatorService.selectBasePerformanceIndicatorListTree(basePerformanceIndicator);
-        return success(list);
-    }
 }

airport-common/src/main/java/com/sundot/airport/common/enums/BasePerformanceIndicatorTypeEnum.java

@@ -4,20 +4,20 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * 考核指标表类型枚举
+ * 考核指标表事/病假类型枚举
  */
 @Getter
 @AllArgsConstructor
-public enum BasePerformanceIndicatorTypeEnum {
+public enum BasePerformanceIndicatorLeaveTypeEnum {
 
-    CATEGORY("CATEGORY", "类别"),
-    BUSINESS("BUSINESS", "业务");
+    PERSONAL_LEAVE("PERSONAL_LEAVE", "事假"),
+    SICK_LEAVE("SICK_LEAVE", "病假");
 
     private final String code;
     private final String desc;
 
-    public static BasePerformanceIndicatorTypeEnum getByCode(String code) {
-        for (BasePerformanceIndicatorTypeEnum itemEnum : values()) {
+    public static BasePerformanceIndicatorLeaveTypeEnum getByCode(String code) {
+        for (BasePerformanceIndicatorLeaveTypeEnum itemEnum : values()) {
             if (itemEnum.getCode().equals(code)) {
                 return itemEnum;
             }

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

@@ -5,15 +5,15 @@ import java.math.BigDecimal;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.sundot.airport.common.annotation.Excel;
-import com.sundot.airport.common.core.domain.TreeEntity;
+import com.sundot.airport.common.core.domain.BaseEntity;
 
 /**
  * 考核指标对象 base_performance_indicator
  *
  * @author ruoyi
- * @date 2026-04-20
+ * @date 2026-04-28
  */
-public class BasePerformanceIndicator extends TreeEntity {
+public class BasePerformanceIndicator extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /** 租户号 */
@@ -25,22 +25,26 @@ public class BasePerformanceIndicator extends TreeEntity {
     /** 主键 */
     private Long id;
 
-    /** 类型 */
-    @Excel(name = "类型", readConverterExp = "CATEGORY=类别,BUSINESS=业务", combo = "类别,业务")
-    private String type;
+    /** 所属分类编码 */
+    @Excel(name = "所属分类编码", type = Excel.Type.EXPORT)
+    private String categoryCode;
+
+    /** 所属分类名称 */
+    @Excel(name = "所属分类名称")
+    private String categoryName;
+
+    /** 编码 */
+    @Excel(name = "编码", type = Excel.Type.EXPORT)
+    private String code;
 
     /** 序号 */
     @Excel(name = "序号")
-    private String code;
+    private String serialNumber;
 
     /** 指标名称 */
     @Excel(name = "指标名称")
     private String name;
 
-    /** 层级 */
-    @Excel(name = "层级")
-    private Integer level;
-
     /** 分值 */
     @Excel(name = "分值")
     private BigDecimal score;
@@ -49,6 +53,18 @@ public class BasePerformanceIndicator extends TreeEntity {
     @Excel(name = "单位")
     private String unit;
 
+    /** 事/病假 */
+    @Excel(name = "事/病假",
+            readConverterExp = "PERSONAL_LEAVE=事假," +
+                    "SICK_LEAVE=病假,",
+            combo = "事假,病假",
+            type = Excel.Type.EXPORT)
+    private String leaveType;
+
+    /** 事/病假描述  */
+    @Excel(name = "事/病假", type = Excel.Type.IMPORT)
+    private String leaveTypeDesc;
+
     public void setTenantId(String tenantId) {
         this.tenantId = tenantId;
     }
@@ -73,12 +89,20 @@ public class BasePerformanceIndicator extends TreeEntity {
         return id;
     }
 
-    public void setType(String type) {
-        this.type = type;
+    public void setCategoryCode(String categoryCode) {
+        this.categoryCode = categoryCode;
     }
 
-    public String getType() {
-        return type;
+    public String getCategoryCode() {
+        return categoryCode;
+    }
+
+    public void setCategoryName(String categoryName) {
+        this.categoryName = categoryName;
+    }
+
+    public String getCategoryName() {
+        return categoryName;
     }
 
     public void setCode(String code) {
@@ -89,20 +113,20 @@ public class BasePerformanceIndicator extends TreeEntity {
         return code;
     }
 
-    public void setName(String name) {
-        this.name = name;
+    public void setSerialNumber(String serialNumber) {
+        this.serialNumber = serialNumber;
     }
 
-    public String getName() {
-        return name;
+    public String getSerialNumber() {
+        return serialNumber;
     }
 
-    public void setLevel(Integer level) {
-        this.level = level;
+    public void setName(String name) {
+        this.name = name;
     }
 
-    public Integer getLevel() {
-        return level;
+    public String getName() {
+        return name;
     }
 
     public void setScore(BigDecimal score) {
@@ -121,6 +145,22 @@ public class BasePerformanceIndicator extends TreeEntity {
         return unit;
     }
 
+    public void setLeaveType(String leaveType) {
+        this.leaveType = leaveType;
+    }
+
+    public String getLeaveType() {
+        return leaveType;
+    }
+
+    public String getLeaveTypeDesc() {
+        return leaveTypeDesc;
+    }
+
+    public void setLeaveTypeDesc(String leaveTypeDesc) {
+        this.leaveTypeDesc = leaveTypeDesc;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -132,15 +172,14 @@ public class BasePerformanceIndicator extends TreeEntity {
                 .append("updateTime", getUpdateTime())
                 .append("remark", getRemark())
                 .append("id", getId())
-                .append("type", getType())
+                .append("categoryCode", getCategoryCode())
+                .append("categoryName", getCategoryName())
                 .append("code", getCode())
+                .append("serialNumber", getSerialNumber())
                 .append("name", getName())
-                .append("parentId", getParentId())
-                .append("ancestors", getAncestors())
-                .append("level", getLevel())
-                .append("orderNum", getOrderNum())
                 .append("score", getScore())
                 .append("unit", getUnit())
+                .append("leaveType", getLeaveType())
                 .toString();
     }
 }

airport-system/src/main/java/com/sundot/airport/system/mapper/BasePerformanceIndicatorMapper.java

@@ -3,13 +3,12 @@ package com.sundot.airport.system.mapper;
 import java.util.List;
 
 import com.sundot.airport.system.domain.BasePerformanceIndicator;
-import org.apache.ibatis.annotations.Param;
 
 /**
  * 考核指标Mapper接口
  *
  * @author ruoyi
- * @date 2026-04-20
+ * @date 2026-04-28
  */
 public interface BasePerformanceIndicatorMapper {
     /**
@@ -59,20 +58,4 @@ public interface BasePerformanceIndicatorMapper {
      * @return 结果
      */
     public int deleteBasePerformanceIndicatorByIds(Long[] ids);
-
-    /**
-     * 根据ID查询所有子元素
-     *
-     * @param id ID
-     * @return 列表
-     */
-    public List<BasePerformanceIndicator> selectChildrenById(Long id);
-
-    /**
-     * 修改子元素关系
-     *
-     * @param list 子元素
-     * @return 结果
-     */
-    public int updateChildren(@Param("list") List<BasePerformanceIndicator> list);
 }

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

@@ -8,7 +8,7 @@ import com.sundot.airport.system.domain.BasePerformanceIndicator;
  * 考核指标Service接口
  *
  * @author ruoyi
- * @date 2026-04-20
+ * @date 2026-04-28
  */
 public interface IBasePerformanceIndicatorService {
     /**
@@ -60,18 +60,11 @@ public interface IBasePerformanceIndicatorService {
     public int deleteBasePerformanceIndicatorById(Long id);
 
     /**
-     * 查询考核指标列表树形结构
+     * 导入考核指标列表
      *
-     * @param basePerformanceIndicator 考核指标
-     * @return 考核指标集合
-     */
-    public List<BasePerformanceIndicator> selectBasePerformanceIndicatorListTree(BasePerformanceIndicator basePerformanceIndicator);
-
-    /**
-     * 构建前端所需要树结构
-     *
-     * @param list 列表
-     * @return 树结构列表
+     * @param list          数据列表
+     * @param updateSupport 是否更新支持
+     * @return 导入结果信息
      */
-    public List<BasePerformanceIndicator> buildTree(List<BasePerformanceIndicator> list);
+    public String importData(List<BasePerformanceIndicator> list, boolean updateSupport);
 }

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

@@ -1,32 +1,41 @@
 package com.sundot.airport.system.service.impl;
 
-import java.util.ArrayList;
-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.collection.CollUtil;
+import cn.hutool.core.util.ObjUtil;
+import com.sundot.airport.common.core.domain.entity.SysDictData;
 import com.sundot.airport.common.exception.ServiceException;
 import com.sundot.airport.common.utils.DateUtils;
-import org.apache.commons.lang3.ObjectUtils;
+import com.sundot.airport.system.domain.BasePerformanceIndicatorCategory;
+import com.sundot.airport.system.service.IBasePerformanceIndicatorCategoryService;
+import com.sundot.airport.system.service.ISysDictDataService;
+import com.sundot.airport.system.utils.CodeGeneratorUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.sundot.airport.system.mapper.BasePerformanceIndicatorMapper;
 import com.sundot.airport.system.domain.BasePerformanceIndicator;
 import com.sundot.airport.system.service.IBasePerformanceIndicatorService;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 
 /**
  * 考核指标Service业务层处理
  *
  * @author ruoyi
- * @date 2026-04-20
+ * @date 2026-04-28
  */
 @Service
 public class BasePerformanceIndicatorServiceImpl implements IBasePerformanceIndicatorService {
     @Autowired
     private BasePerformanceIndicatorMapper basePerformanceIndicatorMapper;
+    @Autowired
+    private IBasePerformanceIndicatorCategoryService basePerformanceIndicatorCategoryService;
+    @Autowired
+    private ISysDictDataService sysDictDataService;
+    @Autowired
+    private CodeGeneratorUtil codeGeneratorUtil;
 
     /**
      * 查询考核指标
@@ -58,19 +67,19 @@ public class BasePerformanceIndicatorServiceImpl implements IBasePerformanceIndi
      */
     @Override
     public int insertBasePerformanceIndicator(BasePerformanceIndicator basePerformanceIndicator) {
-        basePerformanceIndicator.setCreateTime(DateUtils.getNowDate());
-        if (ObjectUtil.isEmpty(basePerformanceIndicator.getParentId()) || basePerformanceIndicator.getParentId().equals(0L)) {
-            basePerformanceIndicator.setAncestors("0");
-            basePerformanceIndicator.setLevel(1);
+        BasePerformanceIndicator query = new BasePerformanceIndicator();
+        query.setCategoryCode(basePerformanceIndicator.getCategoryCode());
+        query.setName(basePerformanceIndicator.getName());
+        List<BasePerformanceIndicator> existingList = basePerformanceIndicatorMapper.selectBasePerformanceIndicatorList(query);
+        if (CollUtil.isNotEmpty(existingList)) {
+            basePerformanceIndicator.setUpdateTime(DateUtils.getNowDate());
+            basePerformanceIndicator.setId(existingList.get(0).getId());
+            return basePerformanceIndicatorMapper.updateBasePerformanceIndicator(basePerformanceIndicator);
         } else {
-            BasePerformanceIndicator info = basePerformanceIndicatorMapper.selectBasePerformanceIndicatorById(basePerformanceIndicator.getParentId());
-            if (ObjectUtil.isEmpty(info)) {
-                throw new ServiceException("父分类不存在，不允许新增");
-            }
-            basePerformanceIndicator.setAncestors(info.getAncestors() + "," + basePerformanceIndicator.getParentId());
-            basePerformanceIndicator.setLevel(basePerformanceIndicator.getAncestors().split(",").length);
+            basePerformanceIndicator.setCreateTime(DateUtils.getNowDate());
+            basePerformanceIndicator.setCode(codeGeneratorUtil.getNextCodeGenerator());
+            return basePerformanceIndicatorMapper.insertBasePerformanceIndicator(basePerformanceIndicator);
         }
-        return basePerformanceIndicatorMapper.insertBasePerformanceIndicator(basePerformanceIndicator);
     }
 
     /**
@@ -79,41 +88,13 @@ public class BasePerformanceIndicatorServiceImpl implements IBasePerformanceIndi
      * @param basePerformanceIndicator 考核指标
      * @return 结果
      */
-    @Transactional(rollbackFor = Exception.class)
     @Override
     public int updateBasePerformanceIndicator(BasePerformanceIndicator basePerformanceIndicator) {
         basePerformanceIndicator.setUpdateTime(DateUtils.getNowDate());
-        BasePerformanceIndicator newParent = basePerformanceIndicatorMapper.selectBasePerformanceIndicatorById(basePerformanceIndicator.getParentId());
-        BasePerformanceIndicator old = basePerformanceIndicatorMapper.selectBasePerformanceIndicatorById(basePerformanceIndicator.getId());
-        if (ObjectUtils.isNotEmpty(newParent) && ObjectUtils.isNotEmpty(old)) {
-            String newAncestors = newParent.getAncestors() + "," + newParent.getId();
-            String oldAncestors = old.getAncestors();
-            basePerformanceIndicator.setAncestors(newAncestors);
-            basePerformanceIndicator.setLevel(basePerformanceIndicator.getAncestors().split(",").length);
-            updateChildren(basePerformanceIndicator.getId(), newAncestors, oldAncestors);
-        }
         return basePerformanceIndicatorMapper.updateBasePerformanceIndicator(basePerformanceIndicator);
     }
 
     /**
-     * 修改子元素关系
-     *
-     * @param id           被修改的元素ID
-     * @param newAncestors 新的父ID集合
-     * @param oldAncestors 旧的父ID集合
-     */
-    private void updateChildren(Long id, String newAncestors, String oldAncestors) {
-        List<BasePerformanceIndicator> children = basePerformanceIndicatorMapper.selectChildrenById(id);
-        for (BasePerformanceIndicator child : children) {
-            child.setAncestors(child.getAncestors().replaceFirst(oldAncestors, newAncestors));
-            child.setLevel(child.getAncestors().split(",").length);
-        }
-        if (!CollectionUtils.isEmpty(children)) {
-            basePerformanceIndicatorMapper.updateChildren(children);
-        }
-    }
-
-    /**
      * 批量删除考核指标
      *
      * @param ids 需要删除的考核指标主键
@@ -136,57 +117,99 @@ public class BasePerformanceIndicatorServiceImpl implements IBasePerformanceIndi
     }
 
     /**
-     * 查询考核指标列表树形结构
+     * 导入考核指标列表
      *
-     * @param basePerformanceIndicator 考核指标
-     * @return 考核指标集合
+     * @param list            数据列表
+     * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
+     * @return 结果
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
-    public List<BasePerformanceIndicator> selectBasePerformanceIndicatorListTree(BasePerformanceIndicator basePerformanceIndicator) {
-        List<BasePerformanceIndicator> list = selectBasePerformanceIndicatorList(basePerformanceIndicator);
-        return buildTree(list);
+    public String importData(List<BasePerformanceIndicator> list, boolean isUpdateSupport) {
+        if (CollUtil.isEmpty(list)) {
+            throw new ServiceException("导入速率数据不能为空！");
+        }
+
+        SysDictData leaveTypeQueryParam = new SysDictData();
+        leaveTypeQueryParam.setDictType("base_performance_indicator_leave_type");
+        List<SysDictData> leaveTypeList = sysDictDataService.selectDictDataList(leaveTypeQueryParam);
+        Map<String, String> leaveTypeMap = leaveTypeList.stream().collect(Collectors.toMap(SysDictData::getDictLabel, SysDictData::getDictValue));
+
+        BasePerformanceIndicatorCategory categoryQueryParam = new BasePerformanceIndicatorCategory();
+        categoryQueryParam.setLevel(2);
+        List<BasePerformanceIndicatorCategory> categoryList = basePerformanceIndicatorCategoryService.selectBasePerformanceIndicatorCategoryList(categoryQueryParam);
+        Map<String, String> categoryMap = categoryList.stream().collect(Collectors.toMap(BasePerformanceIndicatorCategory::getName, BasePerformanceIndicatorCategory::getCode, (oldValue, newValue) -> newValue));
+
+        int successNum = 0;
+        int failureNum = 0;
+        StringBuilder successMsg = new StringBuilder();
+        StringBuilder failureMsg = new StringBuilder();
+
+        for (BasePerformanceIndicator data : list) {
+            // 根据名称填充ID字段
+            fillIdsByName(data, categoryMap, leaveTypeMap);
+            try {
+                if (ObjUtil.isNull(data.getCategoryCode()) || ObjUtil.isNull(data.getCategoryName())) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、所属分类不能为空");
+                    continue;
+                }
+
+                // 查询是否已存在（根据【日期+当班大队+班次】唯一）
+                BasePerformanceIndicator queryParam = new BasePerformanceIndicator();
+                queryParam.setCategoryCode(data.getCategoryCode());
+                queryParam.setName(data.getName());
+                List<BasePerformanceIndicator> existingList = basePerformanceIndicatorMapper.selectBasePerformanceIndicatorList(queryParam);
+
+                if (CollUtil.isEmpty(existingList)) {
+                    // 新增
+                    data.setCode(codeGeneratorUtil.getNextCodeGenerator());
+                    data.setCreateTime(DateUtils.getNowDate());
+                    basePerformanceIndicatorMapper.insertBasePerformanceIndicator(data);
+                    successNum++;
+                    successMsg.append("<br/>" + successNum + "、所属分类名称【" + data.getCategoryName() + "】、指标名称【" + data.getName() + "】导入成功");
+                } else if (isUpdateSupport) {
+                    // 更新
+                    BasePerformanceIndicator old = existingList.get(0);
+                    data.setId(old.getId());
+                    data.setUpdateTime(DateUtils.getNowDate());
+                    basePerformanceIndicatorMapper.updateBasePerformanceIndicator(data);
+                    successNum++;
+                    successMsg.append("<br/>" + successNum + "、所属分类名称【" + data.getCategoryName() + "】、指标名称【" + data.getName() + "】更新成功");
+                } else {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、所属分类名称【" + data.getCategoryName() + "】、指标名称【" + data.getName() + "】已存在");
+                }
+            } catch (Exception e) {
+                failureNum++;
+                String msg = "<br/>" + failureNum + "、所属分类名称【" + data.getCategoryName() + "】、指标名称【" + data.getName() + "】导入失败：";
+                failureMsg.append(msg + e.getMessage());
+            }
+        }
+
+        if (failureNum > 0) {
+            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
+            throw new ServiceException(failureMsg.toString());
+        } else {
+            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+        }
+        return successMsg.toString();
     }
 
     /**
-     * 构建前端所需要树结构
+     * 根据名称填充ID字段
      *
-     * @param list 列表
-     * @return 树结构列表
+     * @param data 速率数据
      */
-    @Override
-    public List<BasePerformanceIndicator> buildTree(List<BasePerformanceIndicator> list) {
-        // 结果列表
-        List<BasePerformanceIndicator> result = new ArrayList<>();
-
-        // 临时Map，用于快速查找节点
-        Map<Long, BasePerformanceIndicator> nodeMap = new HashMap<>();
-
-        // 第一次遍历：将所有节点存入Map
-        for (BasePerformanceIndicator node : list) {
-            nodeMap.put(node.getId(), node);
+    private void fillIdsByName(BasePerformanceIndicator data, Map<String, String> categoryMap, Map<String, String> leaveTypeMap) {
+        // 分类编码
+        if (ObjUtil.isNotNull(data.getCategoryName())) {
+            data.setCategoryCode(categoryMap.get(data.getCategoryName()));
         }
 
-        // 第二次遍历：建立父子关系
-        for (BasePerformanceIndicator node : list) {
-            Long parentId = node.getParentId();
-            if (parentId == null || parentId == 0L) {
-                // 父ID为null或0，说明是根节点
-                result.add(node);
-            } else {
-                // 查找父节点
-                BasePerformanceIndicator parent = nodeMap.get(parentId);
-                if (parent != null) {
-                    // 初始化子节点列表
-                    if (parent.getChildren() == null) {
-                        parent.setChildren(new ArrayList<>());
-                    }
-                    // 将当前节点添加到父节点的子列表中
-                    List<BasePerformanceIndicator> children = (List<BasePerformanceIndicator>) parent.getChildren();
-                    children.add(node);
-                }
-            }
+        // 事/病假
+        if (ObjUtil.isNotNull(data.getLeaveTypeDesc())) {
+            data.setLeaveType(leaveTypeMap.get(data.getLeaveTypeDesc()));
         }
-
-        return result;
     }
 }

airport-system/src/main/resources/mapper/system/BasePerformanceIndicatorMapper.xml

@@ -13,15 +13,14 @@
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
         <result property="id" column="id"/>
-        <result property="type" column="type"/>
+        <result property="categoryCode" column="category_code"/>
+        <result property="categoryName" column="category_name"/>
         <result property="code" column="code"/>
+        <result property="serialNumber" column="serial_number"/>
         <result property="name" column="name"/>
-        <result property="parentId" column="parent_id"/>
-        <result property="ancestors" column="ancestors"/>
-        <result property="level" column="level"/>
-        <result property="orderNum" column="order_num"/>
         <result property="score" column="score"/>
         <result property="unit" column="unit"/>
+        <result property="leaveType" column="leave_type"/>
     </resultMap>
 
     <sql id="selectBasePerformanceIndicatorVo">
@@ -33,15 +32,14 @@
                update_time,
                remark,
                id,
-               type,
+               category_code,
+               category_name,
                code,
+               serial_number,
                name,
-               parent_id,
-               ancestors,
-               level,
-               order_num,
                score,
-               unit
+               unit,
+               leave_type
         from base_performance_indicator
     </sql>
 
@@ -51,15 +49,16 @@
         <where>
             <if test="tenantId != null  and tenantId != ''">and tenant_id = #{tenantId}</if>
             <if test="revision != null ">and revision = #{revision}</if>
-            <if test="type != null  and type != ''">and type = #{type}</if>
+            <if test="categoryCode != null  and categoryCode != ''">and category_code = #{categoryCode}</if>
+            <if test="categoryName != null  and categoryName != ''">and category_name like concat('%', #{categoryName},
+                '%')
+            </if>
             <if test="code != null  and code != ''">and code = #{code}</if>
+            <if test="serialNumber != null  and serialNumber != ''">and serial_number = #{serialNumber}</if>
             <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
-            <if test="parentId != null ">and parent_id = #{parentId}</if>
-            <if test="ancestors != null  and ancestors != ''">and ancestors = #{ancestors}</if>
-            <if test="level != null ">and level = #{level}</if>
-            <if test="orderNum != null ">and order_num = #{orderNum}</if>
             <if test="score != null ">and score = #{score}</if>
             <if test="unit != null  and unit != ''">and unit = #{unit}</if>
+            <if test="leaveType != null  and leaveType != ''">and leave_type = #{leaveType}</if>
         </where>
     </select>
 
@@ -79,15 +78,14 @@
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
-            <if test="type != null and type != ''">type,</if>
+            <if test="categoryCode != null and categoryCode != ''">category_code,</if>
+            <if test="categoryName != null and categoryName != ''">category_name,</if>
             <if test="code != null">code,</if>
+            <if test="serialNumber != null">serial_number,</if>
             <if test="name != null and name != ''">name,</if>
-            <if test="parentId != null">parent_id,</if>
-            <if test="ancestors != null and ancestors != ''">ancestors,</if>
-            <if test="level != null">level,</if>
-            <if test="orderNum != null">order_num,</if>
             <if test="score != null">score,</if>
             <if test="unit != null">unit,</if>
+            <if test="leaveType != null">leave_type,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="tenantId != null">#{tenantId},</if>
@@ -97,15 +95,14 @@
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
-            <if test="type != null and type != ''">#{type},</if>
+            <if test="categoryCode != null and categoryCode != ''">#{categoryCode},</if>
+            <if test="categoryName != null and categoryName != ''">#{categoryName},</if>
             <if test="code != null">#{code},</if>
+            <if test="serialNumber != null">#{serialNumber},</if>
             <if test="name != null and name != ''">#{name},</if>
-            <if test="parentId != null">#{parentId},</if>
-            <if test="ancestors != null and ancestors != ''">#{ancestors},</if>
-            <if test="level != null">#{level},</if>
-            <if test="orderNum != null">#{orderNum},</if>
             <if test="score != null">#{score},</if>
             <if test="unit != null">#{unit},</if>
+            <if test="leaveType != null">#{leaveType},</if>
         </trim>
     </insert>
 
@@ -119,15 +116,14 @@
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
-            <if test="type != null and type != ''">type = #{type},</if>
+            <if test="categoryCode != null and categoryCode != ''">category_code = #{categoryCode},</if>
+            <if test="categoryName != null and categoryName != ''">category_name = #{categoryName},</if>
             <if test="code != null">code = #{code},</if>
+            <if test="serialNumber != null">serial_number = #{serialNumber},</if>
             <if test="name != null and name != ''">name = #{name},</if>
-            <if test="parentId != null">parent_id = #{parentId},</if>
-            <if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
-            <if test="level != null">level = #{level},</if>
-            <if test="orderNum != null">order_num = #{orderNum},</if>
             <if test="score != null">score = #{score},</if>
             <if test="unit != null">unit = #{unit},</if>
+            <if test="leaveType != null">leave_type = #{leaveType},</if>
         </trim>
         where id = #{id}
     </update>
@@ -144,28 +140,4 @@
             #{id}
         </foreach>
     </delete>
-
-    <select id="selectChildrenById" parameterType="Long" resultMap="BasePerformanceIndicatorResult">
-        select *
-        from base_performance_indicator
-        where find_in_set(#{id}, ancestors)
-    </select>
-
-    <update id="updateChildren" parameterType="java.util.List">
-        update base_performance_indicator set ancestors =
-        <foreach collection="list" item="item" index="index"
-                 separator=" " open="case id" close="end">
-            when #{item.id} then #{item.ancestors}
-        </foreach>,
-        level =
-        <foreach collection="list" item="item" index="index"
-                 separator=" " open="case id" close="end">
-            when #{item.id} then #{item.level}
-        </foreach>
-        where id in
-        <foreach collection="list" item="item" index="index"
-                 separator="," open="(" close=")">
-            #{item.id}
-        </foreach>
-    </update>
 </mapper>