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

---
 fw-morax-server/src/main/java/cn/fw/morax/server/controller/app/EvalPoolController.java | 42 ++++++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 12 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 8383c62..6ec3046 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,19 +90,28 @@ public class EvalPoolController {
         if (Objects.isNull(userId)) {
             userId = user.getUserId();
         }
-        return success(evalGroupPoolService.evalPoolSelector(userId, monthly));
+//        return success(evalGroupPoolService.evalPoolSelector(userId, monthly));
+        return success();
     }
 
+//    /**
+//     * 考评详情查询 (查看自己考评详情)
+//     */
+//    @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,
-                                                                @Valid EvalUserRankDTO dto) {
-        dto.initMonthly();
-        dto.setUserId(userId);
-        return success(evalGroupPoolService.queryRankStagePools(dto));
+    public Message<List<EvalUserRankStageVO>> evalPoolOwnDetail(@CurrentUser Long userId) {
+        return success();
     }
 
     /**
@@ -111,13 +120,22 @@ public class EvalPoolController {
      */
     @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));
+    public Message<List<EvalUserRankStageVO>> evalPoolDetail() {
+        return success();
     }
+//    /**
+//     * 考评详情查询 (查看他人考评详情)
+//     *
+//     */
+//    @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