From f2ed69d70d34cf1376af264763b81587e285e7ed Mon Sep 17 00:00:00 2001
From: jiangchao <jiangchao@feewee.cn>
Date: Thu, 23 Mar 2023 10:02:52 +0800
Subject: [PATCH] feature(*): 人员质量评测接口

---
 fw-morax-dao/src/main/resources/mapper/kpi/KpiAssessDao.xml                               |  2 +-
 fw-morax-domain/src/main/java/cn/fw/morax/domain/db/kpi/KpiAssess.java                    |  2 ++
 fw-morax-domain/src/main/java/cn/fw/morax/domain/db/kpi/KpiAssessDetail.java              |  2 ++
 fw-morax-domain/src/main/java/cn/fw/morax/domain/db/kpi/KpiAssessPenalty.java             |  2 ++
 fw-morax-service/src/main/java/cn/fw/morax/service/biz/kpi/KpiAssessBizService.java       |  9 +++++++++
 fw-morax-service/src/main/java/cn/fw/morax/service/biz/kpi/KpiCalculateAssessService.java | 11 ++++++++---
 6 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/fw-morax-dao/src/main/resources/mapper/kpi/KpiAssessDao.xml b/fw-morax-dao/src/main/resources/mapper/kpi/KpiAssessDao.xml
index 157ac36..6528404 100644
--- a/fw-morax-dao/src/main/resources/mapper/kpi/KpiAssessDao.xml
+++ b/fw-morax-dao/src/main/resources/mapper/kpi/KpiAssessDao.xml
@@ -3,7 +3,7 @@
 <mapper namespace="cn.fw.morax.dao.kpi.KpiAssessDao">
 
     <sql id="all_columns">
-        id,name,post_id,post_name,shop_ids,shop_names,rank,group_id,yn,create_by,create_time,update_by,update_time
+        id,post_id,post_name,shop_ids,shop_names,rank,group_id,yn,create_by,create_time,update_by,update_time
     </sql>
 
     <select id="getConfigs" resultType="cn.fw.morax.domain.db.kpi.KpiAssess">
diff --git a/fw-morax-domain/src/main/java/cn/fw/morax/domain/db/kpi/KpiAssess.java b/fw-morax-domain/src/main/java/cn/fw/morax/domain/db/kpi/KpiAssess.java
index 9006bda..d678cd2 100644
--- a/fw-morax-domain/src/main/java/cn/fw/morax/domain/db/kpi/KpiAssess.java
+++ b/fw-morax-domain/src/main/java/cn/fw/morax/domain/db/kpi/KpiAssess.java
@@ -6,6 +6,7 @@ import cn.fw.common.data.mybatis.handler.LongListTypeHandler;
 import cn.fw.common.data.mybatis.handler.StringListTypeHandler;
 import cn.fw.morax.domain.enums.KpiAssessTypeEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -67,6 +68,7 @@ public class KpiAssess extends BaseAuditableEntity<KpiAssess, Long> {
     /**
      * 逻辑删除
      */
+    @TableLogic
     private Boolean yn;
 
     /**
diff --git a/fw-morax-domain/src/main/java/cn/fw/morax/domain/db/kpi/KpiAssessDetail.java b/fw-morax-domain/src/main/java/cn/fw/morax/domain/db/kpi/KpiAssessDetail.java
index 129d29d..49a667e 100644
--- a/fw-morax-domain/src/main/java/cn/fw/morax/domain/db/kpi/KpiAssessDetail.java
+++ b/fw-morax-domain/src/main/java/cn/fw/morax/domain/db/kpi/KpiAssessDetail.java
@@ -4,6 +4,7 @@ import cn.fw.common.data.entity.BaseAuditableEntity;
 import cn.fw.common.data.entity.BaseAuditableTimeEntity;
 import cn.fw.common.data.mybatis.handler.StringListTypeHandler;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -109,6 +110,7 @@ public class KpiAssessDetail extends BaseAuditableTimeEntity<KpiAssessDetail, Lo
     /**
      * 逻辑删除
      */
+    @TableLogic
     private Boolean yn;
 
 
diff --git a/fw-morax-domain/src/main/java/cn/fw/morax/domain/db/kpi/KpiAssessPenalty.java b/fw-morax-domain/src/main/java/cn/fw/morax/domain/db/kpi/KpiAssessPenalty.java
index 014b95f..db638c6 100644
--- a/fw-morax-domain/src/main/java/cn/fw/morax/domain/db/kpi/KpiAssessPenalty.java
+++ b/fw-morax-domain/src/main/java/cn/fw/morax/domain/db/kpi/KpiAssessPenalty.java
@@ -1,6 +1,7 @@
 package cn.fw.morax.domain.db.kpi;
 
 import cn.fw.common.data.entity.BaseAuditableTimeEntity;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 import lombok.experimental.Accessors;
@@ -119,6 +120,7 @@ public class KpiAssessPenalty extends BaseAuditableTimeEntity<KpiAssessPenalty, 
     /**
      * 逻辑删除
      */
+    @TableLogic
     private Boolean yn;
 
 }
diff --git a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/kpi/KpiAssessBizService.java b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/kpi/KpiAssessBizService.java
index 7f565c8..c982560 100644
--- a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/kpi/KpiAssessBizService.java
+++ b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/kpi/KpiAssessBizService.java
@@ -269,15 +269,24 @@ public class KpiAssessBizService {
         KpiAssess kpiAssess = new KpiAssess();
         if (PublicUtil.isNotEmpty(dto.getId())) {
             kpiAssess.setId(dto.getId());
+        } else {
+            kpiAssess.setCreateBy(dto.getUserId());
         }
         kpiAssess.setType(dto.getType());
         kpiAssess.setPostId(dto.getPostId());
         kpiAssess.setPostName(dto.getPostName());
         kpiAssess.setShopIds(dto.getShopIds());
         kpiAssess.setShopNames(dto.getShopNames());
+        if (KpiAssessTypeEnum.STAR_D.equals(dto.getType())) {
+            kpiAssess.setRank(0);
+        } else {
+            kpiAssess.setRank(dto.getRank());
+        }
         kpiAssess.setRank(dto.getRank());
         kpiAssess.setGroupId(dto.getGroupId());
         kpiAssess.setYn(Boolean.TRUE);
+        kpiAssess.setBackup(Boolean.FALSE);
+        kpiAssess.setUpdateBy(dto.getUserId());
         return kpiAssess;
     }
 
diff --git a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/kpi/KpiCalculateAssessService.java b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/kpi/KpiCalculateAssessService.java
index f23d2bf..1d0a89a 100644
--- a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/kpi/KpiCalculateAssessService.java
+++ b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/kpi/KpiCalculateAssessService.java
@@ -28,6 +28,7 @@ import com.google.common.collect.Lists;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.rocketmq.common.filter.impl.Op;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.BoundSetOperations;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -339,7 +340,11 @@ public class KpiCalculateAssessService {
             return Boolean.FALSE;
         }
         for (KpiPool pool : pools) {
-            BigDecimal rankDiff = new BigDecimal(rank - pool.getAssessRank()).abs();
+            Optional<Integer> assessRank = Optional.ofNullable(pool.getAssessRank());
+            BigDecimal rankDiff = BigDecimal.ZERO;
+            if (assessRank.isPresent()) {
+                rankDiff = new BigDecimal(rank - assessRank.get());
+            }
             log.info("人员质量评测计算排名差，目标排名：{}，绩效池：{}，结果：{}", rank, JSON.toJSONString(pool), rankDiff);
             //奖励
             if (rankDiff.compareTo(BigDecimal.ZERO) > 0) {
@@ -352,10 +357,10 @@ public class KpiCalculateAssessService {
             }
             //处罚
             if (rankDiff.compareTo(BigDecimal.ZERO) < 0) {
-                BigDecimal poolPenaltyScore = rankDiff.multiply(penaltyScore);
+                BigDecimal poolPenaltyScore = rankDiff.multiply(penaltyScore).abs();
                 poolPenaltyScore = (poolPenaltyScore.compareTo(capPersonPenaltyScore) > 0) ? poolPenaltyScore : capPersonPenaltyScore;
 
-                BigDecimal poolPenaltyMoney = rankDiff.multiply(penaltyMoney);
+                BigDecimal poolPenaltyMoney = rankDiff.multiply(penaltyMoney).abs();
                 poolPenaltyMoney = (poolPenaltyMoney.compareTo(capPersonPenaltyMoney) > 0) ? poolPenaltyMoney : capPersonPenaltyMoney;
                 penaltyDetails.add(new KpiAssessPenaltyDetailVO(Boolean.TRUE, pool.getId(), rankDiff, poolPenaltyScore, poolPenaltyMoney));
             }
--
libgit2 0.22.2