KPI / fw-morax

Commit bf4d326c3b934a7f7aa897456d4ba99980947113

Authored by 姜超
1 parent 9ecc8f2d

feature(*): 控制器修改 

控制器修改
Inline Side-by-side
Showing 2 changed files with 244 additions and 184 deletions
fw-morax-server/src/main/java/cn/fw/morax/server/controller/app/EvalController.java
  View file @bf4d326
... ... @@ -35,7 +35,7 @@ import java.util.Set;
35 35 import static cn.fw.common.web.util.ResultBuilder.success;
36 36  
37 37 /**
38   - * 考评指标
  38 + * 考评
39 39 *
40 40 * @author jiangchao
41 41 * @since 2022-11-09
... ... @@ -96,189 +96,6 @@ public class EvalController {
96 96 }
97 97  
98 98 /**
99   - * 本月可查看的其他考评池选项
100   - *
101   - * @param user 用户id
102   - * @param userId 用户id [管理层查看人员薪酬详情时需传值]
103   - * @param yearMonth 月度 [员工人查看自己的酬详情时需传值]
104   - * @return 薪酬池选项
105   - * @ignoreParams user
106   - */
107   - @GetMapping("/pool/selector")
108   - @IgnoreUserToken
109   - @ControllerMethod("本月可查看的其他考评池选项")
110   - public Message<Set<SelectorVO>> evalPoolSelector(@CurrentUser LoginAuthBean user, Long userId, @RequestParam(required = false) YearMonth yearMonth) {
111   - if (Objects.isNull(yearMonth)) {
112   - yearMonth = YearMonth.now();
113   - }
114   - if (Objects.isNull(userId)) {
115   - userId = user.getUserId();
116   - }
117   - return success(evalGroupPoolService.evalPoolSelector(userId, yearMonth));
118   - }
119   -
120   - /**
121   - * 考评详情查询 (查看自己考评详情)
122   - *
123   - * @param userId 用户id
124   - * @param yearMonth 月度
125   - * @return 绩效池详情
126   - * @ignoreParams userId
127   - */
128   - @GetMapping("/pool/own-detail")
129   - @ControllerMethod("考评详情查询")
130   - public Message<EvalUserPoolVO> evalPoolOwnDetail(@CurrentUser Long userId,
131   - @RequestParam(required = false) YearMonth yearMonth) {
132   - if (Objects.isNull(yearMonth)) {
133   - yearMonth = YearMonth.now();
134   - }
135   - return success(evalGroupPoolService.queryUserPoolDetail(userId, yearMonth));
136   - }
137   -
138   - /**
139   - * 考评详情查询 (查看他人考评详情)
140   - *
141   - * @param evalPoolId 用户id
142   - * @return 绩效池详情
143   - * @ignoreParams userId
144   - */
145   - @GetMapping("/pool-detail")
146   - @ControllerMethod("考评详情查询")
147   - public Message<EvalUserPoolVO> evalPoolDetail(@NotNull(message = "考评池id不能为空") Long evalPoolId) {
148   - return success(evalGroupPoolService.queryPoolDetail(evalPoolId));
149   - }
150   -
151   - /**
152   - * 员工考评得分详情
153   - *
154   - * @param evalPoolId
155   - * @param evalGroupIndicatorId
156   - * @return
157   - */
158   - @GetMapping("/staff/score-detail")
159   - @IgnoreAuth
160   - @ControllerMethod("员工考评得分详情")
161   - public Message<EvalPoolIndicatorDetailVO> getStaffHitIndicatorDetail(@NotNull(message = "考评池id不能为空") Long evalPoolId,
162   - @NotNull(message = "指标id不能为空") Long evalGroupIndicatorId,
163   - @NotNull(message = "日期不能为空") @RequestParam("dataDate") LocalDate dataDate) {
164   - return success(evalGroupPoolService.staffHitIndicatorDetail(evalPoolId, evalGroupIndicatorId, dataDate));
165   - }
166   -
167   - /**
168   - * 员工奖惩详情
169   - *
170   - * @param evalPoolId
171   - * @param evalGroupRewardId
172   - * @return
173   - */
174   - @GetMapping("/staff/reward-detail")
175   - @IgnoreAuth
176   - @ControllerMethod("员工奖惩详情")
177   - public Message<EvalPoolRewardDetailVO> getStaffRewardDetail(@NotNull(message = "考评池id不能为空") Long evalPoolId,
178   - @NotNull(message = "指标id不能为空") Long evalGroupRewardId,
179   - @NotNull(message = "日期不能为空") @RequestParam("dataDate") LocalDate dataDate) {
180   - return success(evalGroupPoolService.staffHitRewardDetail(evalPoolId, evalGroupRewardId, dataDate));
181   - }
182   -
183   - /**
184   - * 人员考评指标排名
185   - *
186   - * @param dto
187   - * @return
188   - */
189   - @GetMapping("/eval-indicator/staff-rank")
190   - @ControllerMethod("人员考评指标排名")
191   - public Message<KpiIndicatorRankVO> queryKpiIndicatorRank(@Validated EvalGroupIndicatorRankDTO dto) {
192   - if (dto.getIsEvalGroupIndicator()) {
193   - if (PublicUtil.isEmpty(dto.getEvalGroupIndicatorParamId()) && PublicUtil.isEmpty(dto.getEvalGroupIndicatorPreconditionId())) {
194   - throw new BusinessException("参数错误");
195   - }
196   - } else {
197   - if (PublicUtil.isEmpty(dto.getEvalGroupRewardParamId()) && PublicUtil.isEmpty(dto.getEvalGroupRewardPreconditionId())) {
198   - throw new BusinessException("参数错误");
199   - }
200   - }
201   - return success(evalGroupPoolService.queryEvalIndicatorRank(dto));
202   - }
203   -
204   - /**
205   - * 人员考评池列表
206   - *
207   - * @param dto
208   - * @return
209   - * @ignoreParams currentUser
210   - */
211   - @GetMapping("/staff-pools")
212   - @ControllerMethod("人员考评池列表")
213   - public Message<AppPage<EvalUserPoolVO>> queryUserPool(@Validated EvalPoolQueryDTO dto) {
214   - if (PublicUtil.isEmpty(dto.getMonthly())) {
215   - dto.setMonthly(YearMonth.now());
216   - }
217   - return success(evalPoolService.queryUserPool(dto));
218   - }
219   -
220   - /**
221   - * 门店考评池列表
222   - *
223   - * @param dto
224   - * @return
225   - * @ignoreParams currentUser
226   - */
227   - @GetMapping("/shop-pools")
228   - @ControllerMethod("门店考评池列表")
229   - public Message<AppPage<EvalShopPoolVO>> queryShopPool(@Validated EvalPoolQueryDTO dto) {
230   - if (PublicUtil.isEmpty(dto.getMonthly())) {
231   - dto.setMonthly(YearMonth.now());
232   - }
233   - return success(evalPoolService.queryShopPool(dto));
234   - }
235   -
236   - /**
237   - * 门店考评详情查询
238   - *
239   - * @param evalPoolId 用户id
240   - * @return 绩效池详情
241   - * @ignoreParams userId
242   - */
243   - @GetMapping("/shop-pool")
244   - @ControllerMethod("门店考评详情查询")
245   - public Message<EvalShopPoolVO> queryShopPoolDetail(@NotNull(message = "考评池id不能为空") Long evalPoolId) {
246   - return success(evalGroupPoolService.queryShopPoolDetail(evalPoolId));
247   - }
248   -
249   - /**
250   - * 门店考评得分详情
251   - *
252   - * @param evalPoolId
253   - * @param evalGroupIndicatorId
254   - * @return
255   - */
256   - @GetMapping("/shop/score-detail")
257   - @IgnoreAuth
258   - @ControllerMethod("门店考评得分详情")
259   - public Message<EvalPoolIndicatorDetailVO> getShopHitIndicatorDetail(@NotNull(message = "考评池id不能为空") Long evalPoolId,
260   - @NotNull(message = "指标id不能为空") Long evalGroupIndicatorId,
261   - @NotNull(message = "日期不能为空") @RequestParam("dataDate") LocalDate dataDate) {
262   - return success(evalGroupPoolService.shopHitIndicatorDetail(evalPoolId, evalGroupIndicatorId, dataDate));
263   - }
264   -
265   - /**
266   - * 门店奖惩详情
267   - *
268   - * @param evalPoolId
269   - * @param evalGroupRewardId
270   - * @return
271   - */
272   - @GetMapping("/shop/reward-detail")
273   - @IgnoreAuth
274   - @ControllerMethod("门店奖惩详情")
275   - public Message<EvalPoolRewardDetailVO> getShopRewardDetail(@NotNull(message = "考评池id不能为空") Long evalPoolId,
276   - @NotNull(message = "指标id不能为空") Long evalGroupRewardId,
277   - @NotNull(message = "日期不能为空") @RequestParam("dataDate") LocalDate dataDate) {
278   - return success(evalGroupPoolService.shopHitRewardDetail(evalPoolId, evalGroupRewardId, dataDate));
279   - }
280   -
281   - /**
282 99 * 奖惩分配详情
283 100 *
284 101 */
... ...
fw-morax-server/src/main/java/cn/fw/morax/server/controller/app/EvalPoolController.java 0 → 100644
  View file @bf4d326
  1 +package cn.fw.morax.server.controller.app;
  2 +
  3 +
  4 +import cn.fw.common.exception.BusinessException;
  5 +import cn.fw.common.page.AppPage;
  6 +import cn.fw.common.web.annotation.ControllerMethod;
  7 +import cn.fw.common.web.auth.LoginAuthBean;
  8 +import cn.fw.common.web.auth.annotation.CurrentUser;
  9 +import cn.fw.data.base.domain.common.Message;
  10 +import cn.fw.morax.common.utils.PublicUtil;
  11 +import cn.fw.morax.domain.dto.eval.EvalDTO;
  12 +import cn.fw.morax.domain.dto.eval.EvalGroupIndicatorRankDTO;
  13 +import cn.fw.morax.domain.dto.eval.EvalRewardDistDTO;
  14 +import cn.fw.morax.domain.dto.query.EvalPoolQueryDTO;
  15 +import cn.fw.morax.domain.vo.SelectorVO;
  16 +import cn.fw.morax.domain.vo.eval.*;
  17 +import cn.fw.morax.domain.vo.kpi.KpiIndicatorRankVO;
  18 +import cn.fw.morax.service.biz.SettingDraftBizService;
  19 +import cn.fw.morax.service.biz.eval.*;
  20 +import cn.fw.security.auth.client.annotation.Authorization;
  21 +import cn.fw.security.auth.client.annotation.IgnoreAuth;
  22 +import cn.fw.security.auth.client.annotation.IgnoreUserToken;
  23 +import cn.fw.security.auth.client.enums.AuthType;
  24 +import lombok.RequiredArgsConstructor;
  25 +import lombok.extern.slf4j.Slf4j;
  26 +import org.springframework.validation.annotation.Validated;
  27 +import org.springframework.web.bind.annotation.*;
  28 +
  29 +import javax.validation.constraints.NotNull;
  30 +import java.time.LocalDate;
  31 +import java.time.YearMonth;
  32 +import java.util.Objects;
  33 +import java.util.Set;
  34 +
  35 +import static cn.fw.common.web.util.ResultBuilder.success;
  36 +
  37 +/**
  38 + * 考评池
  39 + *
  40 + * @author jiangchao
  41 + * @since 2022-11-09
  42 + */
  43 +@Slf4j
  44 +@RequiredArgsConstructor
  45 +@Authorization(AuthType.APP)
  46 +@Validated
  47 +@IgnoreAuth
  48 +@RestController
  49 +@RequestMapping("/app/eval-pool")
  50 +public class EvalPoolController {
  51 +
  52 + private final EvalPoolService evalPoolService;
  53 + private final EvalGroupPoolService evalGroupPoolService;
  54 + private final EvalGroupBizService evalGroupBizService;
  55 + private final EvalGroupDataService evalGroupDataService;
  56 + private final SettingDraftBizService settingDraftBizService;
  57 + private final EvalRewardService evalRewardService;
  58 + private final EvalIndicatorValueBizService evalIndicatorValueBizService;
  59 +
  60 + /**
  61 + * 人员考评池列表
  62 + *
  63 + * @param dto
  64 + * @return
  65 + * @ignoreParams currentUser
  66 + */
  67 + @GetMapping("/staffs")
  68 + @ControllerMethod("人员考评池列表")
  69 + public Message<AppPage<EvalUserPoolVO>> queryUserPool(@Validated EvalPoolQueryDTO dto) {
  70 + if (PublicUtil.isEmpty(dto.getMonthly())) {
  71 + dto.setMonthly(YearMonth.now());
  72 + }
  73 + return success(evalPoolService.queryUserPool(dto));
  74 + }
  75 +
  76 + /**
  77 + * 本月可查看的其他考评池选项
  78 + *
  79 + * @param user 用户id
  80 + * @param userId 用户id [管理层查看人员薪酬详情时需传值]
  81 + * @param yearMonth 月度 [员工人查看自己的酬详情时需传值]
  82 + * @return 薪酬池选项
  83 + * @ignoreParams user
  84 + */
  85 + @GetMapping("/staff-selector")
  86 + @IgnoreUserToken
  87 + @ControllerMethod("本月可查看的其他考评池选项")
  88 + public Message<Set<SelectorVO>> evalPoolSelector(@CurrentUser LoginAuthBean user, Long userId, @RequestParam(required = false) YearMonth yearMonth) {
  89 + if (Objects.isNull(yearMonth)) {
  90 + yearMonth = YearMonth.now();
  91 + }
  92 + if (Objects.isNull(userId)) {
  93 + userId = user.getUserId();
  94 + }
  95 + return success(evalGroupPoolService.evalPoolSelector(userId, yearMonth));
  96 + }
  97 +
  98 + /**
  99 + * 考评详情查询 (查看自己考评详情)
  100 + *
  101 + * @param userId 用户id
  102 + * @param yearMonth 月度
  103 + * @return 绩效池详情
  104 + * @ignoreParams userId
  105 + */
  106 + @GetMapping("/own-detail")
  107 + @ControllerMethod("考评详情查询")
  108 + public Message<EvalUserPoolVO> evalPoolOwnDetail(@CurrentUser Long userId,
  109 + @RequestParam(required = false) YearMonth yearMonth) {
  110 + if (Objects.isNull(yearMonth)) {
  111 + yearMonth = YearMonth.now();
  112 + }
  113 + return success(evalGroupPoolService.queryUserPoolDetail(userId, yearMonth));
  114 + }
  115 +
  116 + /**
  117 + * 考评详情查询 (查看他人考评详情)
  118 + *
  119 + * @param evalPoolId 用户id
  120 + * @return 绩效池详情
  121 + * @ignoreParams userId
  122 + */
  123 + @GetMapping("/staff")
  124 + @ControllerMethod("考评详情查询")
  125 + public Message<EvalUserPoolVO> evalPoolDetail(@NotNull(message = "考评池id不能为空") Long evalPoolId) {
  126 + return success(evalGroupPoolService.queryPoolDetail(evalPoolId));
  127 + }
  128 +
  129 + /**
  130 + * 员工考评得分详情
  131 + *
  132 + * @param evalPoolId
  133 + * @param evalGroupIndicatorId
  134 + * @return
  135 + */
  136 + @GetMapping("/staff/score-detail")
  137 + @IgnoreAuth
  138 + @ControllerMethod("员工考评得分详情")
  139 + public Message<EvalPoolIndicatorDetailVO> getStaffHitIndicatorDetail(@NotNull(message = "考评池id不能为空") Long evalPoolId,
  140 + @NotNull(message = "指标id不能为空") Long evalGroupIndicatorId,
  141 + @NotNull(message = "日期不能为空") @RequestParam("dataDate") LocalDate dataDate) {
  142 + return success(evalGroupPoolService.staffHitIndicatorDetail(evalPoolId, evalGroupIndicatorId, dataDate));
  143 + }
  144 +
  145 + /**
  146 + * 员工奖惩详情
  147 + *
  148 + * @param evalPoolId
  149 + * @param evalGroupRewardId
  150 + * @return
  151 + */
  152 + @GetMapping("/staff/reward-detail")
  153 + @IgnoreAuth
  154 + @ControllerMethod("员工奖惩详情")
  155 + public Message<EvalPoolRewardDetailVO> getStaffRewardDetail(@NotNull(message = "考评池id不能为空") Long evalPoolId,
  156 + @NotNull(message = "指标id不能为空") Long evalGroupRewardId,
  157 + @NotNull(message = "日期不能为空") @RequestParam("dataDate") LocalDate dataDate) {
  158 + return success(evalGroupPoolService.staffHitRewardDetail(evalPoolId, evalGroupRewardId, dataDate));
  159 + }
  160 +
  161 + /**
  162 + * 人员考评指标排名
  163 + *
  164 + * @param dto
  165 + * @return
  166 + */
  167 + @GetMapping("/staff-indicator-rank")
  168 + @ControllerMethod("人员考评指标排名")
  169 + public Message<KpiIndicatorRankVO> queryKpiIndicatorRank(@Validated EvalGroupIndicatorRankDTO dto) {
  170 + if (dto.getIsEvalGroupIndicator()) {
  171 + if (PublicUtil.isEmpty(dto.getEvalGroupIndicatorParamId()) && PublicUtil.isEmpty(dto.getEvalGroupIndicatorPreconditionId())) {
  172 + throw new BusinessException("参数错误");
  173 + }
  174 + } else {
  175 + if (PublicUtil.isEmpty(dto.getEvalGroupRewardParamId()) && PublicUtil.isEmpty(dto.getEvalGroupRewardPreconditionId())) {
  176 + throw new BusinessException("参数错误");
  177 + }
  178 + }
  179 + return success(evalGroupPoolService.queryEvalIndicatorRank(dto));
  180 + }
  181 +
  182 + /**
  183 + * 门店考评池列表
  184 + *
  185 + * @param dto
  186 + * @return
  187 + * @ignoreParams currentUser
  188 + */
  189 + @GetMapping("/shops")
  190 + @ControllerMethod("门店考评池列表")
  191 + public Message<AppPage<EvalShopPoolVO>> queryShopPool(@Validated EvalPoolQueryDTO dto) {
  192 + if (PublicUtil.isEmpty(dto.getMonthly())) {
  193 + dto.setMonthly(YearMonth.now());
  194 + }
  195 + return success(evalPoolService.queryShopPool(dto));
  196 + }
  197 +
  198 + /**
  199 + * 门店考评详情查询
  200 + *
  201 + * @param evalPoolId 用户id
  202 + * @return 绩效池详情
  203 + * @ignoreParams userId
  204 + */
  205 + @GetMapping("/shop")
  206 + @ControllerMethod("门店考评详情查询")
  207 + public Message<EvalShopPoolVO> queryShopPoolDetail(@NotNull(message = "考评池id不能为空") Long evalPoolId) {
  208 + return success(evalGroupPoolService.queryShopPoolDetail(evalPoolId));
  209 + }
  210 +
  211 + /**
  212 + * 门店考评得分详情
  213 + *
  214 + * @param evalPoolId
  215 + * @param evalGroupIndicatorId
  216 + * @return
  217 + */
  218 + @GetMapping("/shop/score-detail")
  219 + @IgnoreAuth
  220 + @ControllerMethod("门店考评得分详情")
  221 + public Message<EvalPoolIndicatorDetailVO> getShopHitIndicatorDetail(@NotNull(message = "考评池id不能为空") Long evalPoolId,
  222 + @NotNull(message = "指标id不能为空") Long evalGroupIndicatorId,
  223 + @NotNull(message = "日期不能为空") @RequestParam("dataDate") LocalDate dataDate) {
  224 + return success(evalGroupPoolService.shopHitIndicatorDetail(evalPoolId, evalGroupIndicatorId, dataDate));
  225 + }
  226 +
  227 + /**
  228 + * 门店奖惩详情
  229 + *
  230 + * @param evalPoolId
  231 + * @param evalGroupRewardId
  232 + * @return
  233 + */
  234 + @GetMapping("/shop/reward-detail")
  235 + @IgnoreAuth
  236 + @ControllerMethod("门店奖惩详情")
  237 + public Message<EvalPoolRewardDetailVO> getShopRewardDetail(@NotNull(message = "考评池id不能为空") Long evalPoolId,
  238 + @NotNull(message = "指标id不能为空") Long evalGroupRewardId,
  239 + @NotNull(message = "日期不能为空") @RequestParam("dataDate") LocalDate dataDate) {
  240 + return success(evalGroupPoolService.shopHitRewardDetail(evalPoolId, evalGroupRewardId, dataDate));
  241 + }
  242 +
  243 +}
... ...