feature(*): 修改个人考评

修改个人考评

feature(*): 修改个人考评
修改个人考评
姜超
1 parent 36ec8cd1
Showing 4 changed files with 19 additions and 23 deletions
fw-morax-server/src/main/java/cn/fw/morax/server/controller/app/EvalPoolController.java
fw-morax-server/src/main/java/cn/fw/morax/server/controller/erp/EvalTaskController.java
fw-morax-server/src/main/java/cn/fw/morax/server/task/EvalGroupUserTask.java
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalRewardService.java
@@ -90,8 +90,7 @@ public class EvalPoolController {
         if (Objects.isNull(userId)) {
             userId = user.getUserId();
         }
-//        return success(evalGroupPoolService.evalPoolSelector(userId, monthly));
-        return success();
+        return success(evalGroupPoolService.evalPoolSelector(userId, monthly));
     }
     /**
@@ -99,11 +98,11 @@ public class EvalPoolController {
      */
     @GetMapping("/own-detail")
     @ControllerMethod("考评详情查询")
-    public Message<List<EvalUserRankStageVO>> evalPoolOwnDetail(@CurrentUser Long userId) {
-//        dto.initMonthly();
-//        dto.setUserId(userId);
-//        return success(evalGroupPoolService.queryRankStagePools(dto));
-        return success();
+    public Message<List<EvalUserRankStageVO>> evalPoolOwnDetail(@CurrentUser Long userId,
+                                                                @Valid EvalUserRankDTO dto) {
+        dto.initMonthly();
+        dto.setUserId(userId);
+        return success(evalGroupPoolService.queryRankStagePools(dto));
     }
     /**
@@ -117,8 +116,7 @@ public class EvalPoolController {
         if (PublicUtil.isEmpty(dto.getUserId())) {
             throw new BusinessException("人员信息不能为空");
         }
-//        return success(evalGroupPoolService.queryRankStagePools(dto));
-        return success();
+        return success(evalGroupPoolService.queryRankStagePools(dto));
     }
     /**
@@ -49,7 +49,11 @@ public class EvalTaskController {
     @GetMapping("/group-user")
     @ControllerMethod("考评组人员")
     public Message<Void> processEvalUser(Date date) {
-        evalGroupUserTask.processEvalUser();
+        if (PublicUtil.isEmpty(date)) {
+            evalGroupUserTask.processEvalUser(LocalDate.now().minusDays(1L));
+        } else {
+            evalGroupUserTask.processEvalUser(DateUtil.date2LocalDate(date));
+        }
         return success();
     }
@@ -58,6 +58,12 @@ public class EvalGroupUserTask {
     @Scheduled(cron = TimeTaskConstant.EVAL_GROUP_USER)
     @Transactional(rollbackFor = Exception.class)
     public void processEvalUser() {
+        LocalDate yesterday = LocalDate.now().minusDays(1);
+        this.processEvalUser(yesterday);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void processEvalUser(LocalDate yesterday) {
         Lock lock = distributedLocker.lock(getEvalGroupUserDistKey());
         if (((RLock) lock).isLocked()) {
             try {
@@ -65,7 +71,6 @@ public class EvalGroupUserTask {
                 StopWatch stopWatch = new StopWatch();
                 stopWatch.start("考评组人员更新,查询人事系统人员状态");
                 //查询员工
-                LocalDate yesterday = LocalDate.now().minusDays(1);
                 List<EvalGroupUser> evalGroupUsersForSave = this.queryKpiStaff(yesterday);
                 stopWatch.stop();
                 if (PublicUtil.isEmpty(evalGroupUsersForSave)) {
@@ -160,17 +160,6 @@ public class EvalRewardService {
         EvalGroupRankStage evalGroupRankStage = evalGroupRankStageService.getById(evalGroup.getEvalGroupRankStageId());
         BV.notNull(evalGroupRankStage, "考评阶段不存在，终止计算！");
-
-//        List<EvalShopPool> pools = evalShopPoolService.list(Wrappers.<EvalShopPool>lambdaQuery()
-//                .eq(EvalShopPool::getEvalGroupId, evalGroupId)
-//                .eq(EvalShopPool::getYn, Boolean.TRUE)
-//        );
-//        if (PublicUtil.isEmpty(pools)) {
-//            log.error("考评池不存在，终止计算！");
-//            return;
-//        }
-//        BV.isNotEmpty(pools, "考评池不存在，终止计算！");
-
         List<EvalGroupRewardDim> shopRewardDims = evalGroupRewardDimService.list(Wrappers.<EvalGroupRewardDim>lambdaQuery()
                 .eq(EvalGroupRewardDim::getEvalGroupId, evalGroup.getId())
                 .eq(EvalGroupRewardDim::getType, EvalScopeEnum.SHOP)
@@ -180,7 +169,7 @@ public class EvalRewardService {
             log.error("考评奖惩没有门店：{}", JSON.toJSONString(evalGroup));
             return;
         }
-//        sendDistRewardTodo(shopRewardDims, evalGroup, evalGroupRank, evalGroupRankStage);
+        sendDistRewardTodo(shopRewardDims, evalGroup, evalGroupRank, evalGroupRankStage);
     }
     /**