考核指标表

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

@@ -25,12 +25,12 @@ public class BasePerformanceIndicator extends BaseEntity {
     /** 主键 */
     private Long id;
 
-    /** 所属分类编码 */
-    @Excel(name = "所属分类编码", type = Excel.Type.EXPORT)
+    /** 所属二级分类编码 */
+    @Excel(name = "所属二级分类编码", type = Excel.Type.EXPORT)
     private String categoryCode;
 
-    /** 所属分类名称 */
-    @Excel(name = "所属分类名称")
+    /** 所属二级分类名称 */
+    @Excel(name = "所属二级分类名称")
     private String categoryName;
 
     /** 编码 */

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

@@ -48,19 +48,7 @@ public class BasePerformanceIndicatorServiceImpl implements IBasePerformanceIndi
      */
     @Override
     public BasePerformanceIndicator selectBasePerformanceIndicatorById(Long 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;
+        return basePerformanceIndicatorMapper.selectBasePerformanceIndicatorById(id);
     }
 
     /**
@@ -71,18 +59,7 @@ public class BasePerformanceIndicatorServiceImpl implements IBasePerformanceIndi
      */
     @Override
     public List<BasePerformanceIndicator> selectBasePerformanceIndicatorList(BasePerformanceIndicator 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;
+        return basePerformanceIndicatorMapper.selectBasePerformanceIndicatorList(basePerformanceIndicator);
     }
 
     /**
@@ -93,6 +70,20 @@ 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());
+                }
+            }
+        }
         // 判断奖罚类型
         if (ObjUtil.isNull(basePerformanceIndicator.getScore())) {
             basePerformanceIndicator.setRewardPunishmentType(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.OTHER.getCode());
@@ -127,6 +118,20 @@ 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());
+                }
+            }
+        }
         // 判断奖罚类型
         if (ObjUtil.isNull(basePerformanceIndicator.getScore())) {
             basePerformanceIndicator.setRewardPunishmentType(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.OTHER.getCode());
@@ -182,9 +187,10 @@ public class BasePerformanceIndicatorServiceImpl implements IBasePerformanceIndi
         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));
+        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));
 
         int successNum = 0;
         int failureNum = 0;
@@ -203,7 +209,7 @@ public class BasePerformanceIndicatorServiceImpl implements IBasePerformanceIndi
                 data.setRewardPunishmentType(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.OTHER.getCode());
             }
             // 根据名称填充ID字段
-            fillIdsByName(data, categoryMap, leaveTypeMap);
+            fillIdsByName(data, categoryMap, codeParentIdMap, categoryDataMap, leaveTypeMap);
             try {
                 if (ObjUtil.isNull(data.getCategoryCode()) || ObjUtil.isNull(data.getCategoryName())) {
                     failureNum++;
@@ -211,7 +217,7 @@ public class BasePerformanceIndicatorServiceImpl implements IBasePerformanceIndi
                     continue;
                 }
 
-                // 查询是否已存在（根据【日期+当班大队+班次】唯一）
+                // 查询是否已存在（根据【所属二级分类编码+指标名称】唯一）
                 BasePerformanceIndicator queryParam = new BasePerformanceIndicator();
                 queryParam.setCategoryCode(data.getCategoryCode());
                 queryParam.setName(data.getName());
@@ -257,12 +263,21 @@ public class BasePerformanceIndicatorServiceImpl implements IBasePerformanceIndi
      *
      * @param data 考核指标数据
      */
-    private void fillIdsByName(BasePerformanceIndicator data, Map<String, String> categoryMap, Map<String, String> leaveTypeMap) {
-        // 分类编码
+    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()));
+            if (ObjUtil.isNotNull(categoryOne)) {
+                data.setCategoryCodeOne(categoryOne.getCode());
+                data.setCategoryNameOne(categoryOne.getName());
+            }
+        }
+
         // 事/病假
         if (ObjUtil.isNotNull(data.getLeaveTypeDesc())) {
             data.setLeaveType(leaveTypeMap.get(data.getLeaveTypeDesc()));

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

@@ -22,6 +22,8 @@
         <result property="unit" column="unit"/>
         <result property="leaveType" column="leave_type"/>
         <result property="rewardPunishmentType" column="reward_punishment_type"/>
+        <result property="categoryCodeOne" column="category_code_one"/>
+        <result property="categoryNameOne" column="category_name_one"/>
     </resultMap>
 
     <sql id="selectBasePerformanceIndicatorVo">
@@ -41,7 +43,9 @@
                score,
                unit,
                leave_type,
-               reward_punishment_type
+               reward_punishment_type,
+               category_code_one,
+               category_name_one
         from base_performance_indicator
     </sql>
 
@@ -64,6 +68,11 @@
             <if test="rewardPunishmentType != null  and rewardPunishmentType != ''">and reward_punishment_type =
                 #{rewardPunishmentType}
             </if>
+            <if test="categoryCodeOne != null  and categoryCodeOne != ''">and category_code_one = #{categoryCodeOne}
+            </if>
+            <if test="categoryNameOne != null  and categoryNameOne != ''">and category_name_one like
+                concat('%', #{categoryNameOne}, '%')
+            </if>
         </where>
         order by create_time desc
     </select>
@@ -93,6 +102,8 @@
             <if test="unit != null">unit,</if>
             <if test="leaveType != null">leave_type,</if>
             <if test="rewardPunishmentType != null">reward_punishment_type,</if>
+            <if test="categoryCodeOne != null">category_code_one,</if>
+            <if test="categoryNameOne != null">category_name_one,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="tenantId != null">#{tenantId},</if>
@@ -111,6 +122,8 @@
             <if test="unit != null">#{unit},</if>
             <if test="leaveType != null">#{leaveType},</if>
             <if test="rewardPunishmentType != null">#{rewardPunishmentType},</if>
+            <if test="categoryCodeOne != null">#{categoryCodeOne},</if>
+            <if test="categoryNameOne != null">#{categoryNameOne},</if>
         </trim>
     </insert>
 
@@ -133,6 +146,8 @@
             <if test="unit != null">unit = #{unit},</if>
             <if test="leaveType != null">leave_type = #{leaveType},</if>
             <if test="rewardPunishmentType != null">reward_punishment_type = #{rewardPunishmentType},</if>
+            <if test="categoryCodeOne != null">category_code_one = #{categoryCodeOne},</if>
+            <if test="categoryNameOne != null">category_name_one = #{categoryNameOne},</if>
         </trim>
         where id = #{id}
     </update>