diff --git a/fw-morax-server/src/main/java/cn/fw/morax/server/controller/app/EvalPoolController.java b/fw-morax-server/src/main/java/cn/fw/morax/server/controller/app/EvalPoolController.java index c9a8bf3..589d0f5 100644 --- a/fw-morax-server/src/main/java/cn/fw/morax/server/controller/app/EvalPoolController.java +++ b/fw-morax-server/src/main/java/cn/fw/morax/server/controller/app/EvalPoolController.java @@ -214,15 +214,15 @@ public class EvalPoolController { /** * 门店、人员考评提成指标排名 * - * @param commissionId + * @param evalGroupRewardId * @param dataDate * @return */ - @GetMapping("/reward-commission-rank") - @ControllerMethod("门店、人员考评提成指标排名") - public Message> queryRewardCommissionRank(Long commissionId, + @GetMapping("/reward-rank") + @ControllerMethod("门店、人员考评奖惩排名") + public Message> queryRewardCommissionRank(Long evalGroupRewardId, @NotNull(message = "日期不能为空") @RequestParam("dataDate") LocalDate dataDate) { - return success(evalGroupPoolService.getRewardCondRankLogs(commissionId, dataDate)); + return success(evalGroupPoolService.queryRewardCommissionRank(evalGroupRewardId, dataDate)); } diff --git a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/calculator/eval/reward/EvalRewardRankCalculator.java b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/calculator/eval/reward/EvalRewardRankCalculator.java index 9cf5535..eb3e823 100644 --- a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/calculator/eval/reward/EvalRewardRankCalculator.java +++ b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/calculator/eval/reward/EvalRewardRankCalculator.java @@ -30,13 +30,8 @@ import java.util.stream.Collectors; @RequiredArgsConstructor public class EvalRewardRankCalculator extends EvalRewardBaseCalculator { - private final StringRedisTemplate stringRedisTemplate; private final CommonService commonService; - @Value("${spring.cache.custom.global-prefix}:eval:reward:rank") - @Getter - private String rank; - @Override public EvalRewardCalMethodEnum getCalMethod() { return EvalRewardCalMethodEnum.RANK; @@ -54,7 +49,6 @@ public class EvalRewardRankCalculator extends EvalRewardBaseCalculator { } initReward(userShops); final Long evalGroupRewardId = reward.getId(); - final String key = getRank() + evalGroupRewardId; RankTypeEnum rankType = reward.getRankType(); List preconditions = queryPrecondition(evalGroupRewardId); List params = queryProjectParam(evalGroupRewardId, ParamTypeEnum.LADDER); diff --git a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalGroupPoolService.java b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalGroupPoolService.java index 00885be..d3e3e06 100644 --- a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalGroupPoolService.java +++ b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalGroupPoolService.java @@ -1245,14 +1245,14 @@ public class EvalGroupPoolService { return rankLogVOs; } - public List queryRewardCommissionRank(Long commissionId, LocalDate dataDate) { + public List queryRewardCommissionRank(Long evalGroupRewardId, LocalDate dataDate) { // EvalGroupRewardPrecondition precondition = evalGroupRewardPreconditionService.getById(preconditionId); // BV.notNull(precondition, "奖惩条件不存在"); // final DataTypeEnum dataType = precondition.getDataType(); // final TargetTypeEnum targetType = precondition.getTargetType(); List rankLogs = evalGroupRewardRankLogService.list(Wrappers.lambdaQuery() .eq(EvalGroupRewardRankLog::getDataDate, dataDate) - .eq(EvalGroupRewardRankLog::getReferId, commissionId) + .eq(EvalGroupRewardRankLog::getReferId, evalGroupRewardId) .eq(EvalGroupRewardRankLog::getTargetType, RankIndicatorTypeEnum.REWARD_COMMISSION) .eq(EvalGroupRewardRankLog::getYn, Boolean.TRUE) );