From 9090a114f861e3142105803c4571bd4a9042fa1f Mon Sep 17 00:00:00 2001
From: jiangchao <jiangchao@feewee.cn>
Date: Tue, 23 May 2023 18:34:23 +0800
Subject: [PATCH] feature(*): 修改个人考评

---
 fw-morax-server/src/main/java/cn/fw/morax/server/controller/app/EvalPoolController.java | 42 ++++++++++++------------------------------
 1 file changed, 12 insertions(+), 30 deletions(-)

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<List<EvalUserRankStageVO>> evalPoolOwnDetail(@CurrentUser Long userId,
-//                                                                @Valid EvalUserRankDTO dto) {
-//        dto.initMonthly();
-//        dto.setUserId(userId);
-//        return success(evalGroupPoolService.queryRankStagePools(dto));
-//    }
     /**
      * 考评详情查询 (查看自己考评详情)
      */
     @GetMapping("/own-detail")
     @ControllerMethod("考评详情查询")
-    public Message<List<EvalUserRankStageVO>> evalPoolOwnDetail(@CurrentUser Long userId) {
-        return success();
+    public Message<List<EvalUserRankStageVO>> 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<List<EvalUserRankStageVO>> evalPoolDetail() {
-        return success();
+    public Message<List<EvalUserRankStageVO>> evalPoolDetail(@Valid EvalUserRankDTO dto) {
+        dto.initMonthly();
+        if (PublicUtil.isEmpty(dto.getUserId())) {
+            throw new BusinessException("人员信息不能为空");
+        }
+        return success(evalGroupPoolService.queryRankStagePools(dto));
     }
-//    /**
-//     * 考评详情查询 (查看他人考评详情)
-//     *
-//     */
-//    @GetMapping("/detail")
-//    @ControllerMethod("考评详情查询")
-//    public Message<List<EvalUserRankStageVO>> evalPoolDetail(@Valid EvalUserRankDTO dto) {
-//        dto.initMonthly();
-//        if (PublicUtil.isEmpty(dto.getUserId())) {
-//            throw new BusinessException("人员信息不能为空");
-//        }
-//        return success(evalGroupPoolService.queryRankStagePools(dto));
-//    }
 
     /**
      * 员工考评得分详情
--
libgit2 0.22.2