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 6ec3046..8383c62 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 @@ -90,28 +90,19 @@ public class EvalPoolController { if (Objects.isNull(userId)) { userId = user.getUserId(); } -// return success(evalGroupPoolService.evalPoolSelector(userId, monthly)); - return success(); + return success(evalGroupPoolService.evalPoolSelector(userId, monthly)); } -// /** -// * 考评详情查询 (查看自己考评详情) -// */ -// @GetMapping("/own-detail") -// @ControllerMethod("考评详情查询") -// public Message> evalPoolOwnDetail(@CurrentUser Long userId, -// @Valid EvalUserRankDTO dto) { -// dto.initMonthly(); -// dto.setUserId(userId); -// return success(evalGroupPoolService.queryRankStagePools(dto)); -// } /** * 考评详情查询 (查看自己考评详情) */ @GetMapping("/own-detail") @ControllerMethod("考评详情查询") - public Message> evalPoolOwnDetail(@CurrentUser Long userId) { - return success(); + public Message> evalPoolOwnDetail(@CurrentUser Long userId, + @Valid EvalUserRankDTO dto) { + dto.initMonthly(); + dto.setUserId(userId); + return success(evalGroupPoolService.queryRankStagePools(dto)); } /** @@ -120,22 +111,13 @@ public class EvalPoolController { */ @GetMapping("/detail") @ControllerMethod("考评详情查询") - public Message> evalPoolDetail() { - return success(); + public Message> evalPoolDetail(@Valid EvalUserRankDTO dto) { + dto.initMonthly(); + if (PublicUtil.isEmpty(dto.getUserId())) { + throw new BusinessException("人员信息不能为空"); + } + return success(evalGroupPoolService.queryRankStagePools(dto)); } -// /** -// * 考评详情查询 (查看他人考评详情) -// * -// */ -// @GetMapping("/detail") -// @ControllerMethod("考评详情查询") -// public Message> evalPoolDetail(@Valid EvalUserRankDTO dto) { -// dto.initMonthly(); -// if (PublicUtil.isEmpty(dto.getUserId())) { -// throw new BusinessException("人员信息不能为空"); -// } -// return success(evalGroupPoolService.queryRankStagePools(dto)); -// } /** * 员工考评得分详情