KPI / fw-morax

Commit 220b9724aefd1ed2eafbce2a0a6e98b6a91c7b9d

Authored by 姜超
1 parent 7d59a85e

feature(*): 代码调整 

代码调整
Inline Side-by-side
Showing 3 changed files with 7 additions and 13 deletions
fw-morax-server/src/main/java/cn/fw/morax/server/controller/app/EvalPoolController.java
  View file @220b972
... ... @@ -214,15 +214,15 @@ public class EvalPoolController {
214 214 /**
215 215 * 门店、人员考评提成指标排名
216 216 *
217   - * @param commissionId
  217 + * @param evalGroupRewardId
218 218 * @param dataDate
219 219 * @return
220 220 */
221   - @GetMapping("/reward-commission-rank")
222   - @ControllerMethod("门店、人员考评提成指标排名")
223   - public Message<List<EvalGroupRewardRankLogVO>> queryRewardCommissionRank(Long commissionId,
  221 + @GetMapping("/reward-rank")
  222 + @ControllerMethod("门店、人员考评奖惩排名")
  223 + public Message<List<EvalGroupRewardRankLogVO>> queryRewardCommissionRank(Long evalGroupRewardId,
224 224 @NotNull(message = "日期不能为空") @RequestParam("dataDate") LocalDate dataDate) {
225   - return success(evalGroupPoolService.getRewardCondRankLogs(commissionId, dataDate));
  225 + return success(evalGroupPoolService.queryRewardCommissionRank(evalGroupRewardId, dataDate));
226 226 }
227 227  
228 228  
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/biz/calculator/eval/reward/EvalRewardRankCalculator.java
  View file @220b972
... ... @@ -30,13 +30,8 @@ import java.util.stream.Collectors;
30 30 @RequiredArgsConstructor
31 31 public class EvalRewardRankCalculator extends EvalRewardBaseCalculator {
32 32  
33   - private final StringRedisTemplate stringRedisTemplate;
34 33 private final CommonService commonService;
35 34  
36   - @Value("${spring.cache.custom.global-prefix}:eval:reward:rank")
37   - @Getter
38   - private String rank;
39   -
40 35 @Override
41 36 public EvalRewardCalMethodEnum getCalMethod() {
42 37 return EvalRewardCalMethodEnum.RANK;
... ... @@ -54,7 +49,6 @@ public class EvalRewardRankCalculator extends EvalRewardBaseCalculator {
54 49 }
55 50 initReward(userShops);
56 51 final Long evalGroupRewardId = reward.getId();
57   - final String key = getRank() + evalGroupRewardId;
58 52 RankTypeEnum rankType = reward.getRankType();
59 53 List<EvalGroupRewardPrecondition> preconditions = queryPrecondition(evalGroupRewardId);
60 54 List<EvalGroupRewardParam> params = queryProjectParam(evalGroupRewardId, ParamTypeEnum.LADDER);
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalGroupPoolService.java
  View file @220b972
... ... @@ -1245,14 +1245,14 @@ public class EvalGroupPoolService {
1245 1245 return rankLogVOs;
1246 1246 }
1247 1247  
1248   - public List<EvalGroupRewardRankLogVO> queryRewardCommissionRank(Long commissionId, LocalDate dataDate) {
  1248 + public List<EvalGroupRewardRankLogVO> queryRewardCommissionRank(Long evalGroupRewardId, LocalDate dataDate) {
1249 1249 // EvalGroupRewardPrecondition precondition = evalGroupRewardPreconditionService.getById(preconditionId);
1250 1250 // BV.notNull(precondition, "奖惩条件不存在");
1251 1251 // final DataTypeEnum dataType = precondition.getDataType();
1252 1252 // final TargetTypeEnum targetType = precondition.getTargetType();
1253 1253 List<EvalGroupRewardRankLog> rankLogs = evalGroupRewardRankLogService.list(Wrappers.<EvalGroupRewardRankLog>lambdaQuery()
1254 1254 .eq(EvalGroupRewardRankLog::getDataDate, dataDate)
1255   - .eq(EvalGroupRewardRankLog::getReferId, commissionId)
  1255 + .eq(EvalGroupRewardRankLog::getReferId, evalGroupRewardId)
1256 1256 .eq(EvalGroupRewardRankLog::getTargetType, RankIndicatorTypeEnum.REWARD_COMMISSION)
1257 1257 .eq(EvalGroupRewardRankLog::getYn, Boolean.TRUE)
1258 1258 );
... ...