考核指标表

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

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import cn.hutool.core.collection.CollUtil;
@@ -82,24 +83,36 @@ public class BasePerformanceIndicatorServiceImpl implements IBasePerformanceIndi
      */
     @Override
     public int insertBasePerformanceIndicator(BasePerformanceIndicator basePerformanceIndicator) {
-        // 一级分类+二级分类
+//        // 一级分类+二级分类
+//        BasePerformanceIndicatorCategory categoryQueryParam = new BasePerformanceIndicatorCategory();
+//        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);
+//            }
+//        }
+        // 一级分类编码
         BasePerformanceIndicatorCategory categoryQueryParam = new BasePerformanceIndicatorCategory();
-        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)) {
+        categoryQueryParam.setLevel(2);
+        List<BasePerformanceIndicatorCategory> categoryList = basePerformanceIndicatorCategoryService.selectBasePerformanceIndicatorCategoryList(categoryQueryParam);
+        if (CollUtil.isNotEmpty(categoryList)) {
+            BasePerformanceIndicatorCategory categoryTwo = categoryList.stream().filter(category -> StrUtil.equals(category.getCode(), basePerformanceIndicator.getCategoryCode())).findFirst().orElse(null);
+            if (ObjUtil.isNotNull(categoryTwo)) {
+                BasePerformanceIndicatorCategory categoryOne = basePerformanceIndicatorCategoryService.selectBasePerformanceIndicatorCategoryById(categoryTwo.getParentId());
+                basePerformanceIndicator.setCategoryCodeOne(categoryOne.getCode());
                 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);
             }
         }
         // 判断奖罚类型
@@ -137,23 +150,35 @@ public class BasePerformanceIndicatorServiceImpl implements IBasePerformanceIndi
     public int updateBasePerformanceIndicator(BasePerformanceIndicator basePerformanceIndicator) {
         basePerformanceIndicator.setUpdateTime(DateUtils.getNowDate());
         // 一级分类+二级分类
+//        BasePerformanceIndicatorCategory categoryQueryParam = new BasePerformanceIndicatorCategory();
+//        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);
+//            }
+//        }
+        // 一级分类编码
         BasePerformanceIndicatorCategory categoryQueryParam = new BasePerformanceIndicatorCategory();
-        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)) {
+        categoryQueryParam.setLevel(2);
+        List<BasePerformanceIndicatorCategory> categoryList = basePerformanceIndicatorCategoryService.selectBasePerformanceIndicatorCategoryList(categoryQueryParam);
+        if (CollUtil.isNotEmpty(categoryList)) {
+            BasePerformanceIndicatorCategory categoryTwo = categoryList.stream().filter(category -> StrUtil.equals(category.getCode(), basePerformanceIndicator.getCategoryCode())).findFirst().orElse(null);
+            if (ObjUtil.isNotNull(categoryTwo)) {
+                BasePerformanceIndicatorCategory categoryOne = basePerformanceIndicatorCategoryService.selectBasePerformanceIndicatorCategoryById(categoryTwo.getParentId());
+                basePerformanceIndicator.setCategoryCodeOne(categoryOne.getCode());
                 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);
             }
         }
         // 判断奖罚类型