考核指标表

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

@@ -0,0 +1,29 @@
+package com.sundot.airport.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 考核指标表奖罚类型枚举
+ */
+@Getter
+@AllArgsConstructor
+public enum BasePerformanceIndicatorRewardPunishmentTypeTypeEnum {
+
+    PUNISHMENT("PUNISHMENT", "惩罚"),
+    REWARD("REWARD", "奖励"),
+    OTHER("OTHER", "其他");
+
+    private final String code;
+    private final String desc;
+
+    public static BasePerformanceIndicatorRewardPunishmentTypeTypeEnum getByCode(String code) {
+        for (BasePerformanceIndicatorRewardPunishmentTypeTypeEnum itemEnum : values()) {
+            if (itemEnum.getCode().equals(code)) {
+                return itemEnum;
+            }
+        }
+        return null;
+    }
+
+}

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

@@ -65,6 +65,15 @@ public class BasePerformanceIndicator extends BaseEntity {
     @Excel(name = "事/病假", type = Excel.Type.IMPORT)
     private String leaveTypeDesc;
 
+    /** 奖罚类型 */
+    @Excel(name = "奖罚类型",
+            readConverterExp = "PUNISHMENT=惩罚," +
+                    "REWARD=奖励," +
+                    "OTHER=其他,",
+            combo = "惩罚,奖励,其他",
+            type = Excel.Type.EXPORT)
+    private String rewardPunishmentType;
+
     public void setTenantId(String tenantId) {
         this.tenantId = tenantId;
     }
@@ -161,6 +170,14 @@ public class BasePerformanceIndicator extends BaseEntity {
         this.leaveTypeDesc = leaveTypeDesc;
     }
 
+    public String getRewardPunishmentType() {
+        return rewardPunishmentType;
+    }
+
+    public void setRewardPunishmentType(String rewardPunishmentType) {
+        this.rewardPunishmentType = rewardPunishmentType;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -180,6 +197,7 @@ public class BasePerformanceIndicator extends BaseEntity {
                 .append("score", getScore())
                 .append("unit", getUnit())
                 .append("leaveType", getLeaveType())
+                .append("rewardPunishmentType", getRewardPunishmentType())
                 .toString();
     }
 }

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

@@ -1,5 +1,6 @@
 package com.sundot.airport.system.service.impl;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -7,6 +8,7 @@ import java.util.stream.Collectors;
 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.enums.BasePerformanceIndicatorRewardPunishmentTypeTypeEnum;
 import com.sundot.airport.common.exception.ServiceException;
 import com.sundot.airport.common.utils.DateUtils;
 import com.sundot.airport.system.domain.BasePerformanceIndicatorCategory;
@@ -67,6 +69,16 @@ public class BasePerformanceIndicatorServiceImpl implements IBasePerformanceIndi
      */
     @Override
     public int insertBasePerformanceIndicator(BasePerformanceIndicator basePerformanceIndicator) {
+        // 判断奖罚类型
+        if (ObjUtil.isNull(basePerformanceIndicator.getScore())) {
+            basePerformanceIndicator.setRewardPunishmentType(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.OTHER.getCode());
+        } else if (basePerformanceIndicator.getScore().compareTo(BigDecimal.ZERO) > 0) {
+            basePerformanceIndicator.setRewardPunishmentType(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.REWARD.getCode());
+        } else if (basePerformanceIndicator.getScore().compareTo(BigDecimal.ZERO) < 0) {
+            basePerformanceIndicator.setRewardPunishmentType(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.PUNISHMENT.getCode());
+        } else {
+            basePerformanceIndicator.setRewardPunishmentType(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.OTHER.getCode());
+        }
         BasePerformanceIndicator query = new BasePerformanceIndicator();
         query.setCategoryCode(basePerformanceIndicator.getCategoryCode());
         query.setName(basePerformanceIndicator.getName());
@@ -91,6 +103,16 @@ public class BasePerformanceIndicatorServiceImpl implements IBasePerformanceIndi
     @Override
     public int updateBasePerformanceIndicator(BasePerformanceIndicator basePerformanceIndicator) {
         basePerformanceIndicator.setUpdateTime(DateUtils.getNowDate());
+        // 判断奖罚类型
+        if (ObjUtil.isNull(basePerformanceIndicator.getScore())) {
+            basePerformanceIndicator.setRewardPunishmentType(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.OTHER.getCode());
+        } else if (basePerformanceIndicator.getScore().compareTo(BigDecimal.ZERO) > 0) {
+            basePerformanceIndicator.setRewardPunishmentType(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.REWARD.getCode());
+        } else if (basePerformanceIndicator.getScore().compareTo(BigDecimal.ZERO) < 0) {
+            basePerformanceIndicator.setRewardPunishmentType(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.PUNISHMENT.getCode());
+        } else {
+            basePerformanceIndicator.setRewardPunishmentType(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.OTHER.getCode());
+        }
         return basePerformanceIndicatorMapper.updateBasePerformanceIndicator(basePerformanceIndicator);
     }
 
@@ -127,7 +149,7 @@ public class BasePerformanceIndicatorServiceImpl implements IBasePerformanceIndi
     @Override
     public String importData(List<BasePerformanceIndicator> list, boolean isUpdateSupport) {
         if (CollUtil.isEmpty(list)) {
-            throw new ServiceException("导入速率数据不能为空！");
+            throw new ServiceException("导入考核指标数据不能为空！");
         }
 
         SysDictData leaveTypeQueryParam = new SysDictData();
@@ -146,6 +168,16 @@ public class BasePerformanceIndicatorServiceImpl implements IBasePerformanceIndi
         StringBuilder failureMsg = new StringBuilder();
 
         for (BasePerformanceIndicator data : list) {
+            // 判断奖罚类型
+            if (ObjUtil.isNull(data.getScore())) {
+                data.setRewardPunishmentType(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.OTHER.getCode());
+            } else if (data.getScore().compareTo(BigDecimal.ZERO) > 0) {
+                data.setRewardPunishmentType(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.REWARD.getCode());
+            } else if (data.getScore().compareTo(BigDecimal.ZERO) < 0) {
+                data.setRewardPunishmentType(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.PUNISHMENT.getCode());
+            } else {
+                data.setRewardPunishmentType(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.OTHER.getCode());
+            }
             // 根据名称填充ID字段
             fillIdsByName(data, categoryMap, leaveTypeMap);
             try {
@@ -199,7 +231,7 @@ public class BasePerformanceIndicatorServiceImpl implements IBasePerformanceIndi
     /**
      * 根据名称填充ID字段
      *
-     * @param data 速率数据
+     * @param data 考核指标数据
      */
     private void fillIdsByName(BasePerformanceIndicator data, Map<String, String> categoryMap, Map<String, String> leaveTypeMap) {
         // 分类编码

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

@@ -21,6 +21,7 @@
         <result property="score" column="score"/>
         <result property="unit" column="unit"/>
         <result property="leaveType" column="leave_type"/>
+        <result property="rewardPunishmentType" column="reward_punishment_type"/>
     </resultMap>
 
     <sql id="selectBasePerformanceIndicatorVo">
@@ -39,7 +40,8 @@
                name,
                score,
                unit,
-               leave_type
+               leave_type,
+               reward_punishment_type
         from base_performance_indicator
     </sql>
 
@@ -59,7 +61,11 @@
             <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>
+            <if test="rewardPunishmentType != null  and rewardPunishmentType != ''">and reward_punishment_type =
+                #{rewardPunishmentType}
+            </if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectBasePerformanceIndicatorById" parameterType="Long" resultMap="BasePerformanceIndicatorResult">
@@ -86,6 +92,7 @@
             <if test="score != null">score,</if>
             <if test="unit != null">unit,</if>
             <if test="leaveType != null">leave_type,</if>
+            <if test="rewardPunishmentType != null">reward_punishment_type,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="tenantId != null">#{tenantId},</if>
@@ -103,6 +110,7 @@
             <if test="score != null">#{score},</if>
             <if test="unit != null">#{unit},</if>
             <if test="leaveType != null">#{leaveType},</if>
+            <if test="rewardPunishmentType != null">#{rewardPunishmentType},</if>
         </trim>
     </insert>
 
@@ -124,6 +132,7 @@
             <if test="score != null">score = #{score},</if>
             <if test="unit != null">unit = #{unit},</if>
             <if test="leaveType != null">leave_type = #{leaveType},</if>
+            <if test="rewardPunishmentType != null">reward_punishment_type = #{rewardPunishmentType},</if>
         </trim>
         where id = #{id}
     </update>