KPI / fw-morax

Commit 320f888403cf7ed3f61a70df8832d51e1067e673

Authored by 姜超
1 parent 36ec8cd1

feature(*): 修改个人考评 

修改个人考评
Inline Side-by-side
Showing 4 changed files with 19 additions and 23 deletions
fw-morax-server/src/main/java/cn/fw/morax/server/controller/app/EvalPoolController.java
  View file @320f888
... ... @@ -90,8 +90,7 @@ 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 96 /**
... ... @@ -99,11 +98,11 @@ public class EvalPoolController {
99 98 */
100 99 @GetMapping("/own-detail")
101 100 @ControllerMethod("考评详情查询")
102   - public Message<List<EvalUserRankStageVO>> evalPoolOwnDetail(@CurrentUser Long userId) {
103   -// dto.initMonthly();
104   -// dto.setUserId(userId);
105   -// return success(evalGroupPoolService.queryRankStagePools(dto));
106   - 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));
107 106 }
108 107  
109 108 /**
... ... @@ -117,8 +116,7 @@ public class EvalPoolController {
117 116 if (PublicUtil.isEmpty(dto.getUserId())) {
118 117 throw new BusinessException("人员信息不能为空");
119 118 }
120   -// return success(evalGroupPoolService.queryRankStagePools(dto));
121   - return success();
  119 + return success(evalGroupPoolService.queryRankStagePools(dto));
122 120 }
123 121  
124 122 /**
... ...
fw-morax-server/src/main/java/cn/fw/morax/server/controller/erp/EvalTaskController.java
  View file @320f888
... ... @@ -49,7 +49,11 @@ public class EvalTaskController {
49 49 @GetMapping("/group-user")
50 50 @ControllerMethod("考评组人员")
51 51 public Message<Void> processEvalUser(Date date) {
52   - evalGroupUserTask.processEvalUser();
  52 + if (PublicUtil.isEmpty(date)) {
  53 + evalGroupUserTask.processEvalUser(LocalDate.now().minusDays(1L));
  54 + } else {
  55 + evalGroupUserTask.processEvalUser(DateUtil.date2LocalDate(date));
  56 + }
53 57 return success();
54 58 }
55 59  
... ...
fw-morax-server/src/main/java/cn/fw/morax/server/task/EvalGroupUserTask.java
  View file @320f888
... ... @@ -58,6 +58,12 @@ public class EvalGroupUserTask {
58 58 @Scheduled(cron = TimeTaskConstant.EVAL_GROUP_USER)
59 59 @Transactional(rollbackFor = Exception.class)
60 60 public void processEvalUser() {
  61 + LocalDate yesterday = LocalDate.now().minusDays(1);
  62 + this.processEvalUser(yesterday);
  63 + }
  64 +
  65 + @Transactional(rollbackFor = Exception.class)
  66 + public void processEvalUser(LocalDate yesterday) {
61 67 Lock lock = distributedLocker.lock(getEvalGroupUserDistKey());
62 68 if (((RLock) lock).isLocked()) {
63 69 try {
... ... @@ -65,7 +71,6 @@ public class EvalGroupUserTask {
65 71 StopWatch stopWatch = new StopWatch();
66 72 stopWatch.start("考评组人员更新,查询人事系统人员状态");
67 73 //查询员工
68   - LocalDate yesterday = LocalDate.now().minusDays(1);
69 74 List<EvalGroupUser> evalGroupUsersForSave = this.queryKpiStaff(yesterday);
70 75 stopWatch.stop();
71 76 if (PublicUtil.isEmpty(evalGroupUsersForSave)) {
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalRewardService.java
  View file @320f888
... ... @@ -160,17 +160,6 @@ public class EvalRewardService {
160 160 EvalGroupRankStage evalGroupRankStage = evalGroupRankStageService.getById(evalGroup.getEvalGroupRankStageId());
161 161 BV.notNull(evalGroupRankStage, "考评阶段不存在，终止计算！");
162 162  
163   -
164   -// List<EvalShopPool> pools = evalShopPoolService.list(Wrappers.<EvalShopPool>lambdaQuery()
165   -// .eq(EvalShopPool::getEvalGroupId, evalGroupId)
166   -// .eq(EvalShopPool::getYn, Boolean.TRUE)
167   -// );
168   -// if (PublicUtil.isEmpty(pools)) {
169   -// log.error("考评池不存在，终止计算！");
170   -// return;
171   -// }
172   -// BV.isNotEmpty(pools, "考评池不存在，终止计算！");
173   -
174 163 List<EvalGroupRewardDim> shopRewardDims = evalGroupRewardDimService.list(Wrappers.<EvalGroupRewardDim>lambdaQuery()
175 164 .eq(EvalGroupRewardDim::getEvalGroupId, evalGroup.getId())
176 165 .eq(EvalGroupRewardDim::getType, EvalScopeEnum.SHOP)
... ... @@ -180,7 +169,7 @@ public class EvalRewardService {
180 169 log.error("考评奖惩没有门店：{}", JSON.toJSONString(evalGroup));
181 170 return;
182 171 }
183   -// sendDistRewardTodo(shopRewardDims, evalGroup, evalGroupRank, evalGroupRankStage);
  172 + sendDistRewardTodo(shopRewardDims, evalGroup, evalGroupRank, evalGroupRankStage);
184 173 }
185 174  
186 175 /**
... ...