Merge branch 'test' into eval-detail

姜超
2 parents 19325c46 71e4eae7
Showing 11 changed files with 85 additions and 44 deletions
doc/2023-05-18_update.sql
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/eval/EvalGroupUser.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/eval/EvalShopPool.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/eval/EvalUserPool.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/kpi/KpiPoolDetailVO.java
fw-morax-server/src/main/java/cn/fw/morax/server/task/EvalGroupUserTask.java
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalGroupBizService.java
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalGroupUserBizService.java
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalPoolCommonService.java
fw-morax-service/src/main/java/cn/fw/morax/service/biz/kpi/CombineIndicatorBizService.java
fw-morax-service/src/main/java/cn/fw/morax/service/biz/kpi/KpiPoolBizService.java
+ALTER TABLE `fw_morax`.`eval_shop_pool`
+    CHANGE COLUMN `eval_group_stage_id` `eval_group_rank_stage_id` bigint(20) NOT NULL COMMENT '考评排名阶段id' AFTER `eval_group_rank_id`;
+ALTER TABLE `fw_morax`.`eval_user_pool`
+    CHANGE COLUMN `eval_group_stage_id` `eval_group_rank_stage_id` bigint(20) NOT NULL COMMENT '考评阶段id' AFTER `eval_group_rank_id`;
+ALTER TABLE `fw_morax`.`eval_group_user`
+    ADD COLUMN `eval_group_rank_stage_id` bigint(20) NOT NULL COMMENT '考评排名组阶段id' AFTER `eval_group_rank_id`;
@@ -24,6 +24,10 @@ public class EvalGroupUser extends BaseAuditableTimeEntity&lt;EvalGroupUser, Long&gt; 
      */
     private Long evalGroupRankId;
     /**
+     * 考评排名组阶段id
+     */
+    private Long evalGroupRankStageId;
+    /**
      * 考评组编码
      */
     private String egc;
@@ -39,6 +39,14 @@ public class EvalShopPool extends BaseAuditableTimeEntity&lt;EvalShopPool, Long&gt; {
      * 考评组id
      */
     private Long evalGroupId;
+    /**
+     * 考评排名组id
+     */
+    private Long evalGroupRankId;
+    /**
+     * 考评排名组阶段id
+     */
+    private Long evalGroupRankStageId;
 //    /**
 //     * 用户id
@@ -29,12 +29,15 @@ public class EvalUserPool extends BaseAuditableTimeEntity&lt;EvalUserPool, Long&gt; {
      * 考评组编码
      */
     private String egc;
-
     /**
      * 考评排名组id
      */
     private Long evalGroupRankId;
     /**
+     * 考评排名组阶段id
+     */
+    private Long evalGroupRankStageId;
+    /**
      * 考评组id
      */
     private Long evalGroupId;
@@ -51,9 +51,9 @@ public class KpiPoolDetailVO {
      */
     private String shopName;
     /**
-     * 原来总绩效得分
+     * 真实总绩效得分
      */
-    private BigDecimal originKpiScore;
+    private BigDecimal realKpiScore;
     /**
      * 奖励绩效分
      */
@@ -67,9 +67,9 @@ public class KpiPoolDetailVO {
      */
     private BigDecimal totalScore;
     /**
-     * 绩效得分
+     * 原始绩效得分（无奖惩分）
      */
-    private BigDecimal kpiScore;
+    private BigDecimal originKpiScore;
     /**
      * 当月绩效得分率
      */
@@ -74,9 +74,9 @@ public class EvalGroupUserTask {
                 }
                 stopWatch.start("考评组人员保存，保存条数："+ evalGroupUsersForSave.size());
                 //逻辑删除今天已保存人员，保存人员
-                Set<Long> kpiGroupIds = evalGroupUsersForSave.stream().map(EvalGroupUser::getEvalGroupId).collect(Collectors.toSet());
+                Set<Long> evalGroupIds = evalGroupUsersForSave.stream().map(EvalGroupUser::getEvalGroupId).collect(Collectors.toSet());
                 evalGroupUserService.update(Wrappers.<EvalGroupUser>lambdaUpdate()
-                        .in(EvalGroupUser::getEvalGroupId, kpiGroupIds)
+                        .in(EvalGroupUser::getEvalGroupId, evalGroupIds)
                         .eq(EvalGroupUser::getDataDate, yesterday)
                         .eq(EvalGroupUser::getYn, Boolean.TRUE)
                         .set(EvalGroupUser::getYn, Boolean.FALSE)
@@ -192,6 +192,7 @@ public class EvalGroupBizService {
      */
     public EvalGroupRankVO evalGroupRankDetail(Long id) {
         EvalGroupRank evalGroupRank = evalGroupRankService.getById(id);
+        BV.notNull(evalGroupRank, "考评排名组为空，请重试");
         EvalGroupRankVO evalGroupRankVO = PublicUtil.copy(evalGroupRank, EvalGroupRankVO.class);
         List<EvalGroupRankStage> stages = evalGroupRankStageService.list(Wrappers.<EvalGroupRankStage>lambdaQuery()
@@ -88,6 +88,7 @@ public class EvalGroupUserBizService {
             }
             EvalGroup evalGroup = shopKpiGroupMap.get(user.getShopId());
             user.setEvalGroupRankId(evalGroup.getEvalGroupRankId());
+            user.setEvalGroupRankStageId(evalGroup.getEvalGroupRankStageId());
             user.setEvalGroupId(evalGroup.getId());
             user.setEgc(evalGroup.getEgc());
         }
@@ -2,15 +2,15 @@ package cn.fw.morax.service.biz.eval;
 import cn.fw.ehr.sdk.api.enums.StaffShopTypeEnum;
 import cn.fw.morax.common.utils.PublicUtil;
-import cn.fw.morax.domain.db.eval.EvalGroup;
-import cn.fw.morax.domain.db.eval.EvalGroupUser;
-import cn.fw.morax.domain.db.eval.EvalShopPool;
-import cn.fw.morax.domain.db.eval.EvalUserPool;
+import cn.fw.morax.domain.db.eval.*;
+import cn.fw.morax.domain.enums.EvalScopeEnum;
+import cn.fw.morax.domain.enums.EvalShopPoolStatusEnum;
 import cn.fw.morax.rpc.ehr.EhrRpcService;
 import cn.fw.morax.rpc.ehr.dto.StaffBaseInfoDTO;
 import cn.fw.morax.rpc.ehr.dto.StaffShopInfoDTO;
 import cn.fw.morax.rpc.oop.OopRpcService;
 import cn.fw.morax.rpc.oop.dto.ShopDTO;
+import cn.fw.morax.service.data.eval.EvalGroupRewardDimService;
 import cn.fw.morax.service.data.eval.EvalShopPoolService;
 import cn.fw.morax.service.data.eval.EvalUserPoolService;
 import cn.fw.morax.service.data.salary.SalaryGroupUserService;
@@ -41,6 +41,7 @@ public class EvalPoolCommonService {
     private SalaryGroupUserService salaryGroupUserService;
     private EvalUserPoolService evalUserPoolService;
+    private EvalGroupRewardDimService evalGroupRewardDimService;
     private EvalShopPoolService evalShopPoolService;
     private EhrRpcService ehrRpcService;
     private OopRpcService oopRpcService;
@@ -75,7 +76,7 @@ public class EvalPoolCommonService {
     public Map<Long, EvalShopPool> inspectionShopPools(EvalGroup evalGroup, LocalDate localDate) {
         Set<Long> evalGroupShopIds = new HashSet<>(evalGroup.getShopIds());
         List<EvalShopPool> pools = evalShopPoolService.list(Wrappers.<EvalShopPool>lambdaQuery()
-                .eq(EvalShopPool::getEgc, evalGroup.getEgc())
+                .eq(EvalShopPool::getEvalGroupId, evalGroup.getId())
                 .in(EvalShopPool::getShopId, evalGroupShopIds)
                 .eq(EvalShopPool::getMonthly, YearMonth.from(localDate))
                 .eq(EvalShopPool::getYn, Boolean.TRUE)
@@ -86,9 +87,20 @@ public class EvalPoolCommonService {
             return v1;
         }));
-        for (Long shopId : evalGroupShopIds) {
+        List<EvalGroupRewardDim> rewardDims = evalGroupRewardDimService.list(Wrappers.<EvalGroupRewardDim>lambdaQuery()
+                .eq(EvalGroupRewardDim::getEvalGroupId, evalGroup.getId())
+                .eq(EvalGroupRewardDim::getType, EvalScopeEnum.SHOP)
+                .eq(EvalGroupRewardDim::getYn, Boolean.TRUE)
+        );
+        if (PublicUtil.isEmpty(rewardDims)) {
+            return new HashMap<>();
+        }
+        Set<Long> distRewardShopIds = rewardDims.stream().flatMap(dim -> dim.getShopIds().stream()).collect(Collectors.toSet());
+        for (Long shopId : distRewardShopIds) {
             if (! shopPoolMap.containsKey(shopId)) {
-                EvalShopPool shopPool = this.inspectionShopPool(shopId, evalGroup, localDate);
+                EvalShopPoolStatusEnum status = (distRewardShopIds.contains(shopId))
+                        ? EvalShopPoolStatusEnum.CALC_REWARD : EvalShopPoolStatusEnum.NO_REWARD;
+                EvalShopPool shopPool = this.inspectionShopPool(shopId, evalGroup, localDate, status);
                 shopPoolMap.put(shopId, shopPool);
             }
         }
@@ -101,9 +113,9 @@ public class EvalPoolCommonService {
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
-    public EvalShopPool inspectionShopPool(Long shopId, EvalGroup evalGroup, LocalDate localDate) {
+    public EvalShopPool inspectionShopPool(Long shopId, EvalGroup evalGroup, LocalDate localDate, EvalShopPoolStatusEnum status) {
         EvalShopPool evalShopPool = evalShopPoolService.getOne(Wrappers.<EvalShopPool>lambdaQuery()
-                .eq(EvalShopPool::getEgc, evalGroup.getEgc())
+                .eq(EvalShopPool::getId, evalGroup.getId())
                 .eq(EvalShopPool::getShopId, shopId)
                 .eq(EvalShopPool::getYn, Boolean.TRUE)
                 .eq(EvalShopPool::getMonthly, YearMonth.from(localDate).minusMonths(1))
@@ -117,16 +129,19 @@ public class EvalPoolCommonService {
             evalShopPool.setMonthly(YearMonth.from(localDate));
             return evalShopPool;
         }
-        return this.createShopPoolData(shopId, evalGroup, localDate);
+        return this.createShopPoolData(shopId, evalGroup, localDate, status);
     }
     @Transactional(rollbackFor = Exception.class)
-    public EvalShopPool createShopPoolData(Long shopId, EvalGroup evalGroup, LocalDate localDate) {
+    public EvalShopPool createShopPoolData(Long shopId, EvalGroup evalGroup, LocalDate localDate, EvalShopPoolStatusEnum status) {
         ShopDTO shopDTO = oopRpcService.queryShop(shopId);
         EvalShopPool evalShopPool = new EvalShopPool();
         evalShopPool.setEgc(evalGroup.getEgc());
         evalShopPool.setEvalGroupId(evalGroup.getId());
+        evalShopPool.setEvalGroupRankId(evalGroup.getEvalGroupRankId());
+        evalShopPool.setEvalGroupRankStageId(evalGroup.getEvalGroupRankStageId());
 //        evalShopPool.setEvalId(evalGroup.getEvalId());
+        evalShopPool.setStatus(status);
         evalShopPool.setShopId(shopId);
         evalShopPool.setShopName(shopDTO.getShortName());
         evalShopPool.setScore(BigDecimal.ZERO);
@@ -207,6 +222,8 @@ public class EvalPoolCommonService {
 //        evalUserPool.setEvalId(user.getEvalGroupRankId());
         evalUserPool.setEgc(user.getEgc());
         evalUserPool.setEvalGroupId(user.getEvalGroupId());
+        evalUserPool.setEvalGroupRankId(user.getEvalGroupRankId());
+        evalUserPool.setEvalGroupRankStageId(user.getEvalGroupRankStageId());
         evalUserPool.setUserId(user.getUserId());
         evalUserPool.setUserName(user.getUserName());
         evalUserPool.setPostId(user.getPostId());
@@ -69,7 +69,7 @@ public class CombineIndicatorBizService {
     public List<CombineAndEvalIndicatorVO> combineAndEvalIndicators(CombineIndicatorQueryDTO dto) {
         List<CombineAndEvalIndicatorVO> combineAndEvalIndicatorVOS = Lists.newArrayListWithCapacity(100);
-        if (PublicUtil.isEmpty(dto.getCombineIndicator()) || Boolean.TRUE.equals(dto.getCombineIndicator())) {
+        if (PublicUtil.isEmpty(dto.getCombineIndicator()) || Boolean.FALSE.equals(dto.getCombineIndicator())) {
             List<EvalIndicator> evalIndicators = evalIndicatorService.list(Wrappers.<EvalIndicator>lambdaQuery()
                     .eq(PublicUtil.isNotEmpty(dto.getSysId()), EvalIndicator::getSysId, dto.getSysId())
                     .eq(PublicUtil.isNotEmpty(dto.getRoleCode()), EvalIndicator::getRoleCode, dto.getRoleCode())
@@ -100,7 +100,7 @@ public class CombineIndicatorBizService {
             return combineAndEvalIndicatorVOS;
         }
-        if (PublicUtil.isEmpty(dto.getCombineIndicator()) || Boolean.FALSE.equals(dto.getCombineIndicator())) {
+        if (PublicUtil.isEmpty(dto.getCombineIndicator()) || Boolean.TRUE.equals(dto.getCombineIndicator())) {
             List<CombineIndicator> combineIndicators = combineIndicatorService.list(Wrappers.<CombineIndicator>lambdaQuery()
                     .eq(CombineIndicator::getGroupId, dto.getGroupId())
                     .eq(PublicUtil.isNotEmpty(dto.getEnable()), CombineIndicator::getEnable, dto.getEnable())
@@ -640,9 +640,10 @@ public class KpiPoolBizService {
             }
         }
         //奖励分正数、惩罚分负数，减去奖惩分数，得到原始分数
-        BigDecimal originKpiScore = kpiPoolDetailVO.getKpiScore().subtract(rewardScore).subtract(punishScore);
+        BigDecimal originKpiScore = kpiPoolDetailVO.getOriginKpiScore().subtract(rewardScore).subtract(punishScore);
         kpiPoolDetailVO.setRewardScore(rewardScore);
         kpiPoolDetailVO.setPunishScore(punishScore.abs());
+        kpiPoolDetailVO.setRealKpiScore(pool.getKpiScore());
         kpiPoolDetailVO.setOriginKpiScore(originKpiScore);
         kpiPoolDetailVO.setRewards(new ArrayList<>());
@@ -713,29 +714,29 @@ public class KpiPoolBizService {
      *
      * @param pool
      */
-    public void processRewardPoint(KpiPool pool, KpiPoolDetailVO poolDetailVO) {
-        List<KpiRewardPoint> list = kpiRewardPointService.list(Wrappers.<KpiRewardPoint>lambdaQuery()
-                .eq(KpiRewardPoint::getUserId, pool.getUserId())
-                .eq(KpiRewardPoint::getPostId, pool.getPostId())
-                .eq(KpiRewardPoint::getShopId, pool.getShopId())
-                .eq(KpiRewardPoint::getMonthly, pool.getMonthly())
-                .eq(KpiRewardPoint::getGroupId, pool.getGroupId())
-        );
-        BigDecimal rewardScore = BigDecimal.ZERO;
-        BigDecimal punishScore = BigDecimal.ZERO;
-        for (KpiRewardPoint point : list) {
-            if (BigDecimal.ZERO.compareTo(point.getScorePoint()) > 0) {
-                punishScore = punishScore.add(point.getScorePoint());
-            } else {
-                rewardScore = rewardScore.add(point.getScorePoint());
-            }
-        }
-        //奖励分正数、惩罚分负数，减去奖惩分数，得到原始分数
-        BigDecimal originKpiScore = poolDetailVO.getKpiScore().subtract(rewardScore).subtract(punishScore);
-        poolDetailVO.setRewardScore(rewardScore);
-        poolDetailVO.setPunishScore(punishScore.abs());
-        poolDetailVO.setOriginKpiScore(originKpiScore);
-    }
+//    public void processRewardPoint(KpiPool pool, KpiPoolDetailVO poolDetailVO) {
+//        List<KpiRewardPoint> list = kpiRewardPointService.list(Wrappers.<KpiRewardPoint>lambdaQuery()
+//                .eq(KpiRewardPoint::getUserId, pool.getUserId())
+//                .eq(KpiRewardPoint::getPostId, pool.getPostId())
+//                .eq(KpiRewardPoint::getShopId, pool.getShopId())
+//                .eq(KpiRewardPoint::getMonthly, pool.getMonthly())
+//                .eq(KpiRewardPoint::getGroupId, pool.getGroupId())
+//        );
+//        BigDecimal rewardScore = BigDecimal.ZERO;
+//        BigDecimal punishScore = BigDecimal.ZERO;
+//        for (KpiRewardPoint point : list) {
+//            if (BigDecimal.ZERO.compareTo(point.getScorePoint()) > 0) {
+//                punishScore = punishScore.add(point.getScorePoint());
+//            } else {
+//                rewardScore = rewardScore.add(point.getScorePoint());
+//            }
+//        }
+//        //奖励分正数、惩罚分负数，减去奖惩分数，得到原始分数
+//        BigDecimal originKpiScore = poolDetailVO.getKpiScore().subtract(rewardScore).subtract(punishScore);
+//        poolDetailVO.setRewardScore(rewardScore);
+//        poolDetailVO.setPunishScore(punishScore.abs());
+//        poolDetailVO.setOriginKpiScore(originKpiScore);
+//    }
     /**
      * 获取绩效组指标总分