考核指标表

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

@@ -74,6 +74,14 @@ public class BasePerformanceIndicator extends BaseEntity {
             type = Excel.Type.EXPORT)
     private String rewardPunishmentType;
 
+    /** 所属一级分类编码 */
+    @Excel(name = "所属一级分类编码", type = Excel.Type.EXPORT)
+    private String categoryCodeOne;
+
+    /** 所属一级分类名称 */
+    @Excel(name = "所属一级分类名称", type = Excel.Type.EXPORT)
+    private String categoryNameOne;
+
     public void setTenantId(String tenantId) {
         this.tenantId = tenantId;
     }
@@ -178,6 +186,22 @@ public class BasePerformanceIndicator extends BaseEntity {
         this.rewardPunishmentType = rewardPunishmentType;
     }
 
+    public String getCategoryCodeOne() {
+        return categoryCodeOne;
+    }
+
+    public void setCategoryCodeOne(String categoryCodeOne) {
+        this.categoryCodeOne = categoryCodeOne;
+    }
+
+    public String getCategoryNameOne() {
+        return categoryNameOne;
+    }
+
+    public void setCategoryNameOne(String categoryNameOne) {
+        this.categoryNameOne = categoryNameOne;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -198,6 +222,8 @@ public class BasePerformanceIndicator extends BaseEntity {
                 .append("unit", getUnit())
                 .append("leaveType", getLeaveType())
                 .append("rewardPunishmentType", getRewardPunishmentType())
+                .append("categoryCodeOne", getCategoryCodeOne())
+                .append("categoryNameOne", getCategoryNameOne())
                 .toString();
     }
 }

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

@@ -3,6 +3,7 @@ package com.sundot.airport.system.service.impl;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import cn.hutool.core.collection.CollUtil;
@@ -47,7 +48,19 @@ public class BasePerformanceIndicatorServiceImpl implements IBasePerformanceIndi
      */
     @Override
     public BasePerformanceIndicator selectBasePerformanceIndicatorById(Long id) {
-        return basePerformanceIndicatorMapper.selectBasePerformanceIndicatorById(id);
+        BasePerformanceIndicator result = basePerformanceIndicatorMapper.selectBasePerformanceIndicatorById(id);
+        BasePerformanceIndicatorCategory basePerformanceIndicatorCategoryQuery = new BasePerformanceIndicatorCategory();
+        basePerformanceIndicatorCategoryQuery.setCode(result.getCategoryCode());
+        List<BasePerformanceIndicatorCategory> basePerformanceIndicatorCategoryList = basePerformanceIndicatorCategoryService.selectBasePerformanceIndicatorCategoryList(basePerformanceIndicatorCategoryQuery);
+        if (CollUtil.isNotEmpty(basePerformanceIndicatorCategoryList)) {
+            BasePerformanceIndicatorCategory basePerformanceIndicatorCategory = basePerformanceIndicatorCategoryList.get(0);
+            BasePerformanceIndicatorCategory basePerformanceIndicatorCategoryOne = basePerformanceIndicatorCategoryService.selectBasePerformanceIndicatorCategoryById(basePerformanceIndicatorCategory.getParentId());
+            if (ObjUtil.isNotNull(basePerformanceIndicatorCategoryOne)) {
+                result.setCategoryCodeOne(basePerformanceIndicatorCategoryOne.getCode());
+                result.setCategoryNameOne(basePerformanceIndicatorCategoryOne.getName());
+            }
+        }
+        return result;
     }
 
     /**
@@ -58,7 +71,18 @@ public class BasePerformanceIndicatorServiceImpl implements IBasePerformanceIndi
      */
     @Override
     public List<BasePerformanceIndicator> selectBasePerformanceIndicatorList(BasePerformanceIndicator basePerformanceIndicator) {
-        return basePerformanceIndicatorMapper.selectBasePerformanceIndicatorList(basePerformanceIndicator);
+        List<BasePerformanceIndicator> result = basePerformanceIndicatorMapper.selectBasePerformanceIndicatorList(basePerformanceIndicator);
+        List<BasePerformanceIndicatorCategory> basePerformanceIndicatorCategoryList = basePerformanceIndicatorCategoryService.selectBasePerformanceIndicatorCategoryList(new BasePerformanceIndicatorCategory());
+        Map<Long, BasePerformanceIndicatorCategory> dataMap = basePerformanceIndicatorCategoryList.stream().collect(Collectors.toMap(BasePerformanceIndicatorCategory::getId, Function.identity(), (oldValue, newValue) -> newValue));
+        Map<String, Long> codeParentIdMap = basePerformanceIndicatorCategoryList.stream().collect(Collectors.toMap(BasePerformanceIndicatorCategory::getCode, BasePerformanceIndicatorCategory::getParentId, (oldValue, newValue) -> newValue));
+        result.forEach(item -> {
+            BasePerformanceIndicatorCategory basePerformanceIndicatorCategoryOne = dataMap.get(codeParentIdMap.get(item.getCode()));
+            if (ObjUtil.isNotNull(basePerformanceIndicatorCategoryOne)) {
+                item.setCategoryCodeOne(basePerformanceIndicatorCategoryOne.getCode());
+                item.setCategoryNameOne(basePerformanceIndicatorCategoryOne.getName());
+            }
+        });
+        return result;
     }
 
     /**