feature(*): 排名修改

排名修改

feature(*): 排名修改
排名修改
姜超
1 parent 9161579f
Showing 2 changed files with 19 additions and 10 deletions
fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/eval/EvalGroupRewardRankLogVO.java
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalGroupPoolService.java
@@ -81,9 +81,22 @@ public class EvalGroupRewardRankLogVO {
     private Long groupId;
     /**
-     * 转换为百分数展示
+     * 转换为百分数展示（条件使用）
      */
-    public void convertValueToPercent(DataTypeEnum dataType, TargetTypeEnum targetType){
+    public void convertPercentForCond(DataTypeEnum dataType, TargetTypeEnum targetType){
+        if (DataTypeEnum.RATIO.equals(dataType)) {
+            this.setValue(this.getValue().multiply(Constant.ONE_HUNDRED));
+        }
+        //有目标
+        if (! TargetTypeEnum.NO.equals(targetType)) {
+            this.setReachValue(this.getReachValue().multiply(Constant.ONE_HUNDRED));
+        }
+    }
+
+    /**
+     * 转换为百分数展示（条件使用）
+     */
+    public void convertPercentForCommission(DataTypeEnum dataType, TargetTypeEnum targetType){
         if (DataTypeEnum.RATIO.equals(dataType)) {
             this.setValue(this.getValue().multiply(Constant.ONE_HUNDRED));
         }
 package cn.fw.morax.service.biz.eval;
 import cn.fw.common.exception.BusinessException;
-import cn.fw.morax.common.config.FlowVal;
 import cn.fw.morax.common.constant.Constant;
 import cn.fw.morax.common.utils.DateUtil;
 import cn.fw.morax.common.utils.PublicUtil;
@@ -14,12 +13,7 @@ import cn.fw.morax.domain.vo.eval.*;
 import cn.fw.morax.domain.vo.kpi.IndicatorUserValueVO;
 import cn.fw.morax.domain.vo.kpi.KpiIndicatorRankStaffVO;
 import cn.fw.morax.domain.vo.kpi.KpiIndicatorRankVO;
-import cn.fw.morax.rpc.approval.FlowApproveRpc;
-import cn.fw.morax.service.biz.ApprovalBizService;
 import cn.fw.morax.service.biz.CommonService;
-import cn.fw.morax.service.biz.kpi.KpiGroupUserBizService;
-import cn.fw.morax.service.data.ApprovalRecordService;
-import cn.fw.morax.service.data.SettingDraftService;
 import cn.fw.morax.service.data.eval.*;
 import cn.fw.morax.service.data.kpi.IndicatorUserValueService;
 import com.alibaba.fastjson.JSON;
@@ -1232,6 +1226,7 @@ public class EvalGroupPoolService {
     public List<EvalGroupRewardRankLogVO> getRewardCondRankLogs(Long preconditionId, LocalDate dataDate) {
         EvalGroupRewardPrecondition precondition = evalGroupRewardPreconditionService.getById(preconditionId);
         BV.notNull(precondition, "奖惩条件不存在");
+        BV.isTrue(ConditionTypeEnum.RANK.equals(precondition.getCondType()), "满足排名率条件才能查询排名情况");
         final DataTypeEnum dataType = precondition.getDataType();
         final TargetTypeEnum targetType = precondition.getTargetType();
         List<EvalGroupRewardRankLog> rankLogs = evalGroupRewardRankLogService.list(Wrappers.<EvalGroupRewardRankLog>lambdaQuery()
@@ -1243,11 +1238,13 @@ public class EvalGroupPoolService {
         Collections.sort(rankLogs);
         List<EvalGroupRewardRankLogVO> rankLogVOs = PublicUtil.copyList(rankLogs, EvalGroupRewardRankLogVO.class);
-        rankLogVOs.stream().forEach(rankLog -> rankLog.convertValueToPercent(dataType, targetType));
+        rankLogVOs.stream().forEach(rankLog -> rankLog.convertPercentForCond(dataType, targetType));
         return rankLogVOs;
     }
     public List<EvalGroupRewardRankLogVO> queryRewardCommissionRank(Long evalGroupRewardId, LocalDate dataDate) {
+        EvalGroupReward reward = evalGroupRewardService.getById(evalGroupRewardId);
+        BV.notNull(reward, "奖惩不存在");
         List<EvalGroupRewardRankLog> rankLogs = evalGroupRewardRankLogService.list(Wrappers.<EvalGroupRewardRankLog>lambdaQuery()
                 .eq(EvalGroupRewardRankLog::getDataDate, dataDate)
                 .eq(EvalGroupRewardRankLog::getReferId, evalGroupRewardId)
@@ -1255,7 +1252,6 @@ public class EvalGroupPoolService {
                 .eq(EvalGroupRewardRankLog::getYn, Boolean.TRUE)
         );
         Collections.sort(rankLogs);
-
         List<EvalGroupRewardRankLogVO> rankLogVOs = PublicUtil.copyList(rankLogs, EvalGroupRewardRankLogVO.class);
         return rankLogVOs;
     }