Commit a64af1d223325a5c53c4a4c81be21d9fcca6b2c6

Authored by 姜超
2 parents 218780a8 ee5d1873

Merge branch 'test' into 'main'

feature(*): 修改个人考评

修改个人考评

See merge request !131
fw-morax-server/src/main/java/cn/fw/morax/server/controller/app/EvalPoolController.java
@@ -90,19 +90,28 @@ public class EvalPoolController { @@ -90,19 +90,28 @@ public class EvalPoolController {
90 if (Objects.isNull(userId)) { 90 if (Objects.isNull(userId)) {
91 userId = user.getUserId(); 91 userId = user.getUserId();
92 } 92 }
93 - return success(evalGroupPoolService.evalPoolSelector(userId, monthly)); 93 +// return success(evalGroupPoolService.evalPoolSelector(userId, monthly));
  94 + return success();
94 } 95 }
95 96
  97 +// /**
  98 +// * 考评详情查询 (查看自己考评详情)
  99 +// */
  100 +// @GetMapping("/own-detail")
  101 +// @ControllerMethod("考评详情查询")
  102 +// public Message<List<EvalUserRankStageVO>> evalPoolOwnDetail(@CurrentUser Long userId,
  103 +// @Valid EvalUserRankDTO dto) {
  104 +// dto.initMonthly();
  105 +// dto.setUserId(userId);
  106 +// return success(evalGroupPoolService.queryRankStagePools(dto));
  107 +// }
96 /** 108 /**
97 * 考评详情查询 (查看自己考评详情) 109 * 考评详情查询 (查看自己考评详情)
98 */ 110 */
99 @GetMapping("/own-detail") 111 @GetMapping("/own-detail")
100 @ControllerMethod("考评详情查询") 112 @ControllerMethod("考评详情查询")
101 - public Message<List<EvalUserRankStageVO>> evalPoolOwnDetail(@CurrentUser Long userId,  
102 - @Valid EvalUserRankDTO dto) {  
103 - dto.initMonthly();  
104 - dto.setUserId(userId);  
105 - return success(evalGroupPoolService.queryRankStagePools(dto)); 113 + public Message<List<EvalUserRankStageVO>> evalPoolOwnDetail(@CurrentUser Long userId) {
  114 + return success();
106 } 115 }
107 116
108 /** 117 /**
@@ -111,13 +120,22 @@ public class EvalPoolController { @@ -111,13 +120,22 @@ public class EvalPoolController {
111 */ 120 */
112 @GetMapping("/detail") 121 @GetMapping("/detail")
113 @ControllerMethod("考评详情查询") 122 @ControllerMethod("考评详情查询")
114 - public Message<List<EvalUserRankStageVO>> evalPoolDetail(@Valid EvalUserRankDTO dto) {  
115 - dto.initMonthly();  
116 - if (PublicUtil.isEmpty(dto.getUserId())) {  
117 - throw new BusinessException("人员信息不能为空");  
118 - }  
119 - return success(evalGroupPoolService.queryRankStagePools(dto)); 123 + public Message<List<EvalUserRankStageVO>> evalPoolDetail() {
  124 + return success();
120 } 125 }
  126 +// /**
  127 +// * 考评详情查询 (查看他人考评详情)
  128 +// *
  129 +// */
  130 +// @GetMapping("/detail")
  131 +// @ControllerMethod("考评详情查询")
  132 +// public Message<List<EvalUserRankStageVO>> evalPoolDetail(@Valid EvalUserRankDTO dto) {
  133 +// dto.initMonthly();
  134 +// if (PublicUtil.isEmpty(dto.getUserId())) {
  135 +// throw new BusinessException("人员信息不能为空");
  136 +// }
  137 +// return success(evalGroupPoolService.queryRankStagePools(dto));
  138 +// }
121 139
122 /** 140 /**
123 * 员工考评得分详情 141 * 员工考评得分详情