考核指标表

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

@@ -79,7 +79,7 @@ public class BasePerformanceIndicator extends BaseEntity {
     private String categoryCodeOne;
 
     /** 所属一级分类名称 */
-    @Excel(name = "所属一级分类名称", type = Excel.Type.EXPORT)
+    @Excel(name = "所属一级分类名称")
     private String categoryNameOne;
 
     public void setTenantId(String tenantId) {

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

@@ -3,11 +3,11 @@ 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;
 import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
 import com.sundot.airport.common.core.domain.entity.SysDictData;
 import com.sundot.airport.common.enums.BasePerformanceIndicatorRewardPunishmentTypeTypeEnum;
 import com.sundot.airport.common.exception.ServiceException;
@@ -70,18 +70,24 @@ public class BasePerformanceIndicatorServiceImpl implements IBasePerformanceIndi
      */
     @Override
     public int insertBasePerformanceIndicator(BasePerformanceIndicator basePerformanceIndicator) {
-        // 一级分类编码
+        // 一级分类+二级分类
         BasePerformanceIndicatorCategory categoryQueryParam = new BasePerformanceIndicatorCategory();
-        List<BasePerformanceIndicatorCategory> categoryList = basePerformanceIndicatorCategoryService.selectBasePerformanceIndicatorCategoryList(categoryQueryParam);
-        if (CollUtil.isNotEmpty(categoryList)) {
-            Map<String, Long> codeParentIdMap = categoryList.stream().collect(Collectors.toMap(BasePerformanceIndicatorCategory::getCode, BasePerformanceIndicatorCategory::getParentId, (oldValue, newValue) -> newValue));
-            Map<Long, BasePerformanceIndicatorCategory> categoryDataMap = categoryList.stream().collect(Collectors.toMap(BasePerformanceIndicatorCategory::getId, Function.identity(), (oldValue, newValue) -> newValue));
-            if (ObjUtil.isNotNull(basePerformanceIndicator.getCategoryCode())) {
-                BasePerformanceIndicatorCategory categoryOne = categoryDataMap.get(codeParentIdMap.get(basePerformanceIndicator.getCategoryCode()));
-                if (ObjUtil.isNotNull(categoryOne)) {
-                    basePerformanceIndicator.setCategoryCodeOne(categoryOne.getCode());
-                    basePerformanceIndicator.setCategoryNameOne(categoryOne.getName());
+        List<BasePerformanceIndicatorCategory> categoryList = basePerformanceIndicatorCategoryService.selectBasePerformanceIndicatorCategoryListTree(categoryQueryParam);
+        if (ObjUtil.isNotNull(basePerformanceIndicator.getCategoryCodeOne())) {
+            BasePerformanceIndicatorCategory categoryOne = categoryList.stream().filter(category -> StrUtil.equals(category.getCode(), basePerformanceIndicator.getCategoryCodeOne())).findFirst().orElse(null);
+            if (ObjUtil.isNotNull(categoryOne)) {
+                basePerformanceIndicator.setCategoryNameOne(categoryOne.getName());
+                if (ObjUtil.isNotNull(basePerformanceIndicator.getCategoryCode()) && CollUtil.isNotEmpty(categoryOne.getChildren())) {
+                    List<BasePerformanceIndicatorCategory> children = (List<BasePerformanceIndicatorCategory>) categoryOne.getChildren();
+                    BasePerformanceIndicatorCategory categoryTwo = children.stream().filter(category -> StrUtil.equals(category.getCode(), basePerformanceIndicator.getCategoryCode())).findFirst().orElse(null);
+                    if (ObjUtil.isNotNull(categoryTwo)) {
+                        basePerformanceIndicator.setCategoryName(categoryTwo.getCode());
+                    } else {
+                        basePerformanceIndicator.setCategoryName(null);
+                    }
                 }
+            } else {
+                basePerformanceIndicator.setCategoryNameOne(null);
             }
         }
         // 判断奖罚类型
@@ -118,18 +124,24 @@ public class BasePerformanceIndicatorServiceImpl implements IBasePerformanceIndi
     @Override
     public int updateBasePerformanceIndicator(BasePerformanceIndicator basePerformanceIndicator) {
         basePerformanceIndicator.setUpdateTime(DateUtils.getNowDate());
-        // 一级分类编码
+        // 一级分类+二级分类
         BasePerformanceIndicatorCategory categoryQueryParam = new BasePerformanceIndicatorCategory();
-        List<BasePerformanceIndicatorCategory> categoryList = basePerformanceIndicatorCategoryService.selectBasePerformanceIndicatorCategoryList(categoryQueryParam);
-        if (CollUtil.isNotEmpty(categoryList)) {
-            Map<String, Long> codeParentIdMap = categoryList.stream().collect(Collectors.toMap(BasePerformanceIndicatorCategory::getCode, BasePerformanceIndicatorCategory::getParentId, (oldValue, newValue) -> newValue));
-            Map<Long, BasePerformanceIndicatorCategory> categoryDataMap = categoryList.stream().collect(Collectors.toMap(BasePerformanceIndicatorCategory::getId, Function.identity(), (oldValue, newValue) -> newValue));
-            if (ObjUtil.isNotNull(basePerformanceIndicator.getCategoryCode())) {
-                BasePerformanceIndicatorCategory categoryOne = categoryDataMap.get(codeParentIdMap.get(basePerformanceIndicator.getCategoryCode()));
-                if (ObjUtil.isNotNull(categoryOne)) {
-                    basePerformanceIndicator.setCategoryCodeOne(categoryOne.getCode());
-                    basePerformanceIndicator.setCategoryNameOne(categoryOne.getName());
+        List<BasePerformanceIndicatorCategory> categoryList = basePerformanceIndicatorCategoryService.selectBasePerformanceIndicatorCategoryListTree(categoryQueryParam);
+        if (ObjUtil.isNotNull(basePerformanceIndicator.getCategoryCodeOne())) {
+            BasePerformanceIndicatorCategory categoryOne = categoryList.stream().filter(category -> StrUtil.equals(category.getCode(), basePerformanceIndicator.getCategoryCodeOne())).findFirst().orElse(null);
+            if (ObjUtil.isNotNull(categoryOne)) {
+                basePerformanceIndicator.setCategoryNameOne(categoryOne.getName());
+                if (ObjUtil.isNotNull(basePerformanceIndicator.getCategoryCode()) && CollUtil.isNotEmpty(categoryOne.getChildren())) {
+                    List<BasePerformanceIndicatorCategory> children = (List<BasePerformanceIndicatorCategory>) categoryOne.getChildren();
+                    BasePerformanceIndicatorCategory categoryTwo = children.stream().filter(category -> StrUtil.equals(category.getCode(), basePerformanceIndicator.getCategoryCode())).findFirst().orElse(null);
+                    if (ObjUtil.isNotNull(categoryTwo)) {
+                        basePerformanceIndicator.setCategoryName(categoryTwo.getCode());
+                    } else {
+                        basePerformanceIndicator.setCategoryName(null);
+                    }
                 }
+            } else {
+                basePerformanceIndicator.setCategoryNameOne(null);
             }
         }
         // 判断奖罚类型
@@ -187,10 +199,7 @@ public class BasePerformanceIndicatorServiceImpl implements IBasePerformanceIndi
         Map<String, String> leaveTypeMap = leaveTypeList.stream().collect(Collectors.toMap(SysDictData::getDictLabel, SysDictData::getDictValue));
 
         BasePerformanceIndicatorCategory categoryQueryParam = new BasePerformanceIndicatorCategory();
-        List<BasePerformanceIndicatorCategory> categoryList = basePerformanceIndicatorCategoryService.selectBasePerformanceIndicatorCategoryList(categoryQueryParam);
-        Map<String, String> categoryMap = categoryList.stream().collect(Collectors.toMap(BasePerformanceIndicatorCategory::getName, BasePerformanceIndicatorCategory::getCode, (oldValue, newValue) -> newValue));
-        Map<String, Long> codeParentIdMap = categoryList.stream().collect(Collectors.toMap(BasePerformanceIndicatorCategory::getCode, BasePerformanceIndicatorCategory::getParentId, (oldValue, newValue) -> newValue));
-        Map<Long, BasePerformanceIndicatorCategory> categoryDataMap = categoryList.stream().collect(Collectors.toMap(BasePerformanceIndicatorCategory::getId, Function.identity(), (oldValue, newValue) -> newValue));
+        List<BasePerformanceIndicatorCategory> categoryList = basePerformanceIndicatorCategoryService.selectBasePerformanceIndicatorCategoryListTree(categoryQueryParam);
 
         int successNum = 0;
         int failureNum = 0;
@@ -209,9 +218,9 @@ public class BasePerformanceIndicatorServiceImpl implements IBasePerformanceIndi
                 data.setRewardPunishmentType(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.OTHER.getCode());
             }
             // 根据名称填充ID字段
-            fillIdsByName(data, categoryMap, codeParentIdMap, categoryDataMap, leaveTypeMap);
+            fillIdsByName(data, categoryList, leaveTypeMap);
             try {
-                if (ObjUtil.isNull(data.getCategoryCode()) || ObjUtil.isNull(data.getCategoryName())) {
+                if (ObjUtil.isNull(data.getCategoryCode()) || ObjUtil.isNull(data.getCategoryName()) || ObjUtil.isNull(data.getCategoryCodeOne()) || ObjUtil.isNull(data.getCategoryNameOne())) {
                     failureNum++;
                     failureMsg.append("<br/>" + failureNum + "、所属分类不能为空");
                     continue;
@@ -263,18 +272,19 @@ public class BasePerformanceIndicatorServiceImpl implements IBasePerformanceIndi
      *
      * @param data 考核指标数据
      */
-    private void fillIdsByName(BasePerformanceIndicator data, Map<String, String> categoryMap, Map<String, Long> codeParentIdMap, Map<Long, BasePerformanceIndicatorCategory> categoryDataMap, Map<String, String> leaveTypeMap) {
-        // 二级分类编码
-        if (ObjUtil.isNotNull(data.getCategoryName())) {
-            data.setCategoryCode(categoryMap.get(data.getCategoryName()));
-        }
-
-        // 一级分类编码
-        if (ObjUtil.isNotNull(data.getCategoryCode())) {
-            BasePerformanceIndicatorCategory categoryOne = categoryDataMap.get(codeParentIdMap.get(data.getCategoryCode()));
+    private void fillIdsByName(BasePerformanceIndicator data, List<BasePerformanceIndicatorCategory> categoryList, Map<String, String> leaveTypeMap) {
+        // 一级分类+二级分类
+        if (ObjUtil.isNotNull(data.getCategoryNameOne())) {
+            BasePerformanceIndicatorCategory categoryOne = categoryList.stream().filter(category -> StrUtil.equals(category.getName(), data.getCategoryNameOne())).findFirst().orElse(null);
             if (ObjUtil.isNotNull(categoryOne)) {
                 data.setCategoryCodeOne(categoryOne.getCode());
-                data.setCategoryNameOne(categoryOne.getName());
+                if (ObjUtil.isNotNull(data.getCategoryName()) && CollUtil.isNotEmpty(categoryOne.getChildren())) {
+                    List<BasePerformanceIndicatorCategory> children = (List<BasePerformanceIndicatorCategory>) categoryOne.getChildren();
+                    BasePerformanceIndicatorCategory categoryTwo = children.stream().filter(category -> StrUtil.equals(category.getName(), data.getCategoryName())).findFirst().orElse(null);
+                    if (ObjUtil.isNotNull(categoryTwo)) {
+                        data.setCategoryCode(categoryTwo.getCode());
+                    }
+                }
             }
         }