Commit 9090a114f861e3142105803c4571bd4a9042fa1f
1 parent
ee5d1873
feature(*): 修改个人考评
修改个人考评
Showing
1 changed file
with
12 additions
and
30 deletions
fw-morax-server/src/main/java/cn/fw/morax/server/controller/app/EvalPoolController.java
... | ... | @@ -90,28 +90,19 @@ public class EvalPoolController { |
90 | 90 | if (Objects.isNull(userId)) { |
91 | 91 | userId = user.getUserId(); |
92 | 92 | } |
93 | -// return success(evalGroupPoolService.evalPoolSelector(userId, monthly)); | |
94 | - return success(); | |
93 | + return success(evalGroupPoolService.evalPoolSelector(userId, monthly)); | |
95 | 94 | } |
96 | 95 | |
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 | -// } | |
108 | 96 | /** |
109 | 97 | * 考评详情查询 (查看自己考评详情) |
110 | 98 | */ |
111 | 99 | @GetMapping("/own-detail") |
112 | 100 | @ControllerMethod("考评详情查询") |
113 | - public Message<List<EvalUserRankStageVO>> evalPoolOwnDetail(@CurrentUser Long userId) { | |
114 | - return success(); | |
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)); | |
115 | 106 | } |
116 | 107 | |
117 | 108 | /** |
... | ... | @@ -120,22 +111,13 @@ public class EvalPoolController { |
120 | 111 | */ |
121 | 112 | @GetMapping("/detail") |
122 | 113 | @ControllerMethod("考评详情查询") |
123 | - public Message<List<EvalUserRankStageVO>> evalPoolDetail() { | |
124 | - return success(); | |
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)); | |
125 | 120 | } |
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 | -// } | |
139 | 121 | |
140 | 122 | /** |
141 | 123 | * 员工考评得分详情 | ... | ... |