feature(*): 查看考评详情

查看考评详情

feature(*): 查看考评详情
查看考评详情
姜超
1 parent a9445e72
Showing 11 changed files with 116 additions and 59 deletions
fw-morax-dao/src/main/resources/mapper/eval/EvalGroupUserMapper.xml
fw-morax-domain/src/main/java/cn/fw/morax/domain/bo/eval/EvalGroupUserShop.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/eval/EvalGroupIndicatorParam.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/EvalPoolVO.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/EvalSelectorVO.java
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/EvalCalculateService.java
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalGroupPoolService.java
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalGroupUserBizService.java
@@ -3,7 +3,7 @@
 <mapper namespace="cn.fw.morax.dao.eval.EvalGroupUserDao">
     <sql id="all_columns">
-        id, egc, eval_id, eval_group_id, user_id, user_name, post_id, post_name, shop_id,
+        id, eval_group_rank_id, eval_group_rank_stage_id, eval_group_id, user_id, user_name, post_id, post_name, shop_id,
         shop_name, ignored, ignore_cause, ignore_cause_desc, anticipated_date,
         remark, data_date, group_id, yn, create_time, update_time
     </sql>
@@ -91,6 +91,11 @@ public class EvalGroupUserShop {
     private BigDecimal reward;
     /**
+     * 是否计不入考评考核
+     */
+    private Boolean ignored;
+
+    /**
      * 指标总分
      */
     private BigDecimal indicatorTotalScore;
@@ -113,7 +113,7 @@ public class EvalGroupIndicatorParam extends BaseAuditableTimeEntity&lt;EvalGroupIn
      */
     public void dividePercent() {
         this.setProportion(this.getProportion().divide(Constant.ONE_HUNDRED, 4, RoundingMode.HALF_UP));
-        if (PublicUtil.isNotEmpty(this.getExtraTargetValue()) &&
+        if (PublicUtil.isNotEmpty(this.getTargetValue()) &&
                 PublicUtil.isNotEmpty(this.getTargetType()) &&
                 TargetTypeEnum.RATIO.equals(this.getTargetType())) {
             this.setTargetValue(this.getTargetValue().divide(Constant.ONE_HUNDRED, 4, RoundingMode.HALF_UP));
+package cn.fw.morax.domain.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author jiangchao
+ * @des:
+ * @date 2023/5/22 11:35
+ */
+@Data
+public class EvalPoolVO {
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+    /**
+     * 用户名称
+     */
+    private String userName;
+    /**
+     * 考评选择
+     */
+    private List<EvalSelectorVO> evalSelectors;
+
+    public EvalPoolVO() {
+    }
+
+    public EvalPoolVO(Long userId, String userName, List<EvalSelectorVO> evalSelectors) {
+        this.userId = userId;
+        this.userName = userName;
+        this.evalSelectors = evalSelectors;
+    }
+}
@@ -5,6 +5,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.List;
@@ -24,6 +25,18 @@ public class EvalSelectorVO {
     private String name;
     /**
+     * 门店
+     */
+    @NotNull(message = "门店")
+    private Long shopId;
+
+    /**
+     * 岗位
+     */
+    @NotNull(message = "岗位")
+    private Long postId;
+
+    /**
      * 排名
      */
     private List<EvalUserGroupRankVO> ranks;
@@ -12,6 +12,7 @@ import cn.fw.morax.domain.dto.eval.EvalGroupIndicatorRankDTO;
 import cn.fw.morax.domain.dto.eval.EvalUserRankDTO;
 import cn.fw.morax.domain.dto.query.EvalPoolQueryDTO;
 import cn.fw.morax.domain.enums.EvalScopeEnum;
+import cn.fw.morax.domain.vo.EvalPoolVO;
 import cn.fw.morax.domain.vo.EvalSelectorVO;
 import cn.fw.morax.domain.vo.eval.*;
 import cn.fw.morax.domain.vo.kpi.KpiIndicatorRankVO;
@@ -70,6 +71,23 @@ public class EvalPoolController {
     }
     /**
+     * 人员信息
+     *
+     * @return
+     * @ignoreParams currentUser
+     */
+    @GetMapping("/staff-info")
+    @ControllerMethod("人员信息")
+    public Message<EvalUserPoolVO> queryUser(@CurrentUser LoginAuthBean user) {
+        EvalUserPoolVO poolVO = new EvalUserPoolVO();
+        if (PublicUtil.isNotEmpty(user)) {
+            poolVO.setUserId(user.getUserId());
+            poolVO.setUserName(user.getUserName());
+        }
+        return success(poolVO);
+    }
+
+    /**
      * 本月可查看的其他考评池选项
      *
      * @param user      用户id
@@ -81,8 +99,8 @@ public class EvalPoolController {
     @GetMapping("/staff-selector")
     @IgnoreUserToken
     @ControllerMethod("本月可查看的其他考评池选项")
-    public Message<List<EvalSelectorVO>> evalPoolSelector(@CurrentUser LoginAuthBean user, Long userId,
-                                                          @RequestParam(required = false) YearMonth monthly) {
+    public Message<EvalPoolVO> evalPoolSelector(@CurrentUser LoginAuthBean user, Long userId,
+                                                @RequestParam(required = false) YearMonth monthly) {
         if (Objects.isNull(monthly)) {
             monthly = YearMonth.now();
         }
@@ -10,6 +10,7 @@ import cn.fw.morax.rpc.ehr.EhrRpcService;
 import cn.fw.morax.rpc.ehr.dto.PerformanceStaffDTO;
 import cn.fw.morax.server.consumer.FlowConsumer;
 import cn.fw.morax.server.task.*;
+import cn.fw.morax.service.biz.eval.EvalCalculateService;
 import cn.fw.security.auth.client.annotation.Authorization;
 import cn.fw.security.auth.client.enums.AuthType;
 import lombok.RequiredArgsConstructor;
@@ -18,6 +19,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
@@ -42,18 +44,23 @@ public class EvalTaskController {
     private final EvalCalcTask evalCalcTask;
     private final EvalGroupTask evalGroupTask;
     private final EvalGroupUserTask evalGroupUserTask;
+    private final EvalCalculateService evalCalculateService;
     @GetMapping("/group-user")
     @ControllerMethod("考评组人员")
-    public Message<Void> processEvalUser() {
+    public Message<Void> processEvalUser(Date date) {
         evalGroupUserTask.processEvalUser();
         return success();
     }
     @GetMapping("/calc-cache")
     @ControllerMethod("缓存要计算的考评")
-    public Message<Void> cacheCalculableEvalGroup() {
-        evalCalcTask.cacheCalculableEvalGroup();
+    public Message<Void> cacheCalculableEvalGroup(Date date) {
+        if (PublicUtil.isEmpty(date)) {
+            evalCalculateService.cacheCalculableEvalGroupIds(LocalDate.now().minusDays(1L));
+        } else {
+            evalCalculateService.cacheCalculableEvalGroupIds(DateUtil.date2LocalDate(date));
+        }
         return success();
     }
@@ -97,7 +97,7 @@ public class EvalGroupUserTask {
      * @return
      */
     private List<EvalGroupUser> queryKpiStaff(LocalDate yesterday) {
-        List<EvalGroup> evalGroups = evalGroupUserBizService.postEffectEvalGroups();
+        List<EvalGroup> evalGroups = evalGroupUserBizService.postEffectEvalGroups(yesterday);
         if (! evalGroups.isEmpty()) {
             log.info("需要生成考评组人员的考评组：{}", evalGroups);
         }
@@ -105,7 +105,7 @@ public class EvalGroupUserTask {
         List<EvalGroupUser> evalGroupUsers = null;
         for (EvalGroup evalGroup : evalGroups) {
             for (Long postId : evalGroup.getPostIds()) {
-                evalGroupUsers = evalGroupUserBizService.fetchBuildKpiUser(postId, evalGroups, yesterday);
+                evalGroupUsers = evalGroupUserBizService.fetchBuildKpiUser(postId, evalGroup, yesterday);
                 evalGroupUsersForSave.addAll(evalGroupUsers);
             }
         }
@@ -239,10 +239,11 @@ public class EvalCalculateService {
                 if (userShop.getIndicatorTotalScore().compareTo(BigDecimal.ZERO) > 0) {
                     scoreRatio = userShop.getScore().divide(userShop.getIndicatorTotalScore(), 2, RoundingMode.DOWN);
                 }
+                BigDecimal reward = (Boolean.TRUE.equals(userShop.getIgnored())) ? BigDecimal.ZERO : userShop.getReward();
                 evalUserPoolService.update(Wrappers.<EvalUserPool>lambdaUpdate()
                         .eq(EvalUserPool::getId, userShop.getPoolId())
                         .eq(EvalUserPool::getYn, Boolean.TRUE)
-                        .set(EvalUserPool::getReward, userShop.getReward())
+                        .set(EvalUserPool::getReward, reward)
                         .set(EvalUserPool::getScore, userShop.getScore())
                         .set(EvalUserPool::getScoreRatio, scoreRatio)
                         .set(EvalUserPool::getMonthly, YearMonth.from(localDate))
@@ -280,9 +281,9 @@ public class EvalCalculateService {
             Map<Long, EvalUserPool> userPoolMap = evalPoolCommonService.inspectionUserPoolMap(evalGroup, users, localDate);
             for (EvalGroupUser user : users) {
-                if (Boolean.TRUE.equals(user.getIgnored())) {
-                    continue;
-                }
+//                if (Boolean.TRUE.equals(user.getIgnored())) {
+//                    continue;
+//                }
                 EvalUserPool userPool = userPoolMap.get(user.getUserId());
                 userShops.add(convertBO(user, userPool));
             }
@@ -637,6 +638,7 @@ public class EvalCalculateService {
         userShop.setGroupId(user.getGroupId());
         userShop.setScore(BigDecimal.ZERO);
         userShop.setReward(BigDecimal.ZERO);
+        userShop.setIgnored(user.getIgnored());
         return userShop;
     }
@@ -9,6 +9,7 @@ import cn.fw.morax.domain.db.kpi.*;
 import cn.fw.morax.domain.dto.eval.EvalGroupIndicatorRankDTO;
 import cn.fw.morax.domain.dto.eval.EvalUserRankDTO;
 import cn.fw.morax.domain.enums.*;
+import cn.fw.morax.domain.vo.EvalPoolVO;
 import cn.fw.morax.domain.vo.EvalSelectorVO;
 import cn.fw.morax.domain.vo.SelectorVO;
 import cn.fw.morax.domain.vo.eval.*;
@@ -132,34 +133,13 @@ public class EvalGroupPoolService {
             List<EvalUserPool> rankPools = stagePoolMap.get(stageVO.getId());
             if (PublicUtil.isNotEmpty(rankPools)) {
                 EvalUserPool stagePool = rankPools.get(0);
-                EvalUserPoolVO evalUserPoolVO = PublicUtil.copy(stagePool, EvalUserPoolVO.class);
+                EvalUserPoolVO evalUserPoolVO = this.poolDetail(stagePool);
                 stageVO.setPool(evalUserPoolVO);
             }
         }
         return stageVos;
     }
-//    /**
-//     * 查询考评详情
-//     *
-//     * @param userId
-//     * @param yearMonth
-//     * @return
-//     */
-//    public List<EvalUserGroupRankVO> queryUserPoolDetail(final Long userId, final YearMonth yearMonth) {
-//        List<EvalUserPool> pools = userEvalPool(userId, yearMonth);
-//        if (PublicUtil.isEmpty(pools)) {
-//            return new ArrayList<>();
-//        }
-//        EvalUserPool userPool = pools.get(0);
-//        Long postId = userPool.getPostId();
-//        Long shopId = userPool.getShopId();
-//
-//        pools.stream().filter()
-//
-//        return poolDetail(evalUserPool);
-//    }
-
     public EvalUserPoolVO poolDetail(EvalUserPool pool) {
         EvalUserPoolVO evalUserPoolVO = PublicUtil.copy(pool, EvalUserPoolVO.class);
         evalUserPoolVO.convertScoreRatio();
@@ -282,21 +262,25 @@ public class EvalGroupPoolService {
      * @param yearMonth
      * @return
      */
-    public List<EvalSelectorVO> evalPoolSelector(Long userId, YearMonth yearMonth) {
+    public EvalPoolVO evalPoolSelector(Long userId, YearMonth yearMonth) {
         List<EvalUserPool> pools = userEvalPool(userId, yearMonth);
         if (CollectionUtils.isEmpty(pools)) {
-            return new ArrayList<>();
+            return null;
         }
+        String userName = pools.stream().findFirst().map(EvalUserPool::getUserName).orElse("");
         List<EvalSelectorVO> selectors = new ArrayList<>();
+        EvalPoolVO evalPoolVO = new EvalPoolVO(userId, userName, selectors);
         Map<Long, String> rankNameMap = this.getRankNameMap(pools);
         Map<String, List<EvalUserPool>> shopPostMap = pools.stream().collect(Collectors.groupingBy(pool -> pool.getShopName() + "(" + pool.getPostName() + ")"));
         //门店、岗位维度
         for (Map.Entry<String, List<EvalUserPool>> shopPostEntry : shopPostMap.entrySet()) {
-
             List<EvalUserGroupRankVO> ranks = new ArrayList<>();
-            Map<Long, List<EvalUserPool>> rankPools = shopPostEntry.getValue().stream().collect(Collectors.groupingBy(EvalUserPool::getEvalGroupRankId));
+            List<EvalUserPool> shopPostPools = shopPostEntry.getValue();
+            Long shopId = shopPostPools.stream().findFirst().map(EvalUserPool::getShopId).get();
+            Long postId = shopPostPools.stream().findFirst().map(EvalUserPool::getPostId).get();
+            Map<Long, List<EvalUserPool>> rankPools = shopPostPools.stream().collect(Collectors.groupingBy(EvalUserPool::getEvalGroupRankId));
+            //排名维度
             for (Map.Entry<Long, List<EvalUserPool>> rankEntry : rankPools.entrySet()) {
-                String rankName = rankNameMap.getOrDefault(rankEntry.getKey(), "");
                 List<EvalUserPool> userRankPools = rankEntry.getValue();
                 double averageKpiScoreRatio = userRankPools.stream()
                         .mapToDouble(r -> Optional.ofNullable(r.getScoreRatio()).orElse(BigDecimal.ZERO).doubleValue())
@@ -307,12 +291,15 @@ public class EvalGroupPoolService {
                 rank.setEvalGroupRankName(rankNameMap.getOrDefault(rankEntry.getKey(), ""));
                 rank.setScoreRatio(new BigDecimal(averageKpiScoreRatio).multiply(Constant.ONE_HUNDRED));
                 rank.setReward(reward);
+                rank.setEvalGroupRankId(rankEntry.getKey());
                 ranks.add(rank);
             }
             EvalSelectorVO evalSelectorVO = new EvalSelectorVO(shopPostEntry.getKey(), ranks);
+            evalSelectorVO.setShopId(shopId);
+            evalSelectorVO.setPostId(postId);
             selectors.add(evalSelectorVO);
         }
-        return selectors;
+        return evalPoolVO;
     }
     public Map<Long, String> getRankNameMap(List<EvalUserPool> pools) {
@@ -53,14 +53,16 @@ public class EvalGroupUserBizService {
     /**
      * 所有集团生效的绩效组配置
      */
-    public List<EvalGroup> postEffectEvalGroups(){
-        LocalDate queryDate = LocalDate.now().minusDays(1L);
+    public List<EvalGroup> postEffectEvalGroups(LocalDate queryDate){
         List<EvalGroup> evalGroups = evalGroupService.getAllEffectGroups(queryDate);
         if (PublicUtil.isEmpty(evalGroups)) {
             log.info("时间：{}，没有正在生效中的考评组配置", DateTimeFormatter.ofPattern("yyyy-MM-dd").format(queryDate));
             return new ArrayList<>();
         }
-        return evalGroups;
+        //过滤岗位为空考评组
+        List<EvalGroup> postEvalGroups = evalGroups.stream()
+                .filter(evalGroup -> PublicUtil.isNotEmpty(evalGroup.getPostIds())).collect(Collectors.toList());
+        return postEvalGroups;
     }
     /**
@@ -69,24 +71,11 @@ public class EvalGroupUserBizService {
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
-    public List<EvalGroupUser> fetchBuildKpiUser(Long postId, List<EvalGroup> evalGroups, LocalDate localDate){
-        Set<Long> shopIds = new HashSet<>();
-        Map<Long, EvalGroup> shopKpiGroupMap = new HashMap<>();
-        for (EvalGroup evalGroup : evalGroups) {
-            shopIds.addAll(evalGroup.getShopIds());
-            for (Long shopId : evalGroup.getShopIds()) {
-                shopKpiGroupMap.put(shopId, evalGroup);
-            }
-        }
-        List<EvalGroupUser> evalGroupUsers = this.fetchPostUsers(postId, new ArrayList<>(shopIds), localDate);
+    public List<EvalGroupUser> fetchBuildKpiUser(Long postId, EvalGroup evalGroup, LocalDate localDate){
+        List<EvalGroupUser> evalGroupUsers = this.fetchPostUsers(postId, evalGroup.getShopIds(), localDate);
         //构建考评组信息
         for (EvalGroupUser user : evalGroupUsers) {
-            if (! shopKpiGroupMap.containsKey(user.getShopId())) {
-                log.error("员工门店没有绩效组配置，门店：{}，岗位：{}，员工：{}", user.getShopId(), user.getPostId(), user.getId());
-                continue;
-            }
-            EvalGroup evalGroup = shopKpiGroupMap.get(user.getShopId());
             user.setEvalGroupRankId(evalGroup.getEvalGroupRankId());
             user.setEvalGroupRankStageId(evalGroup.getEvalGroupRankStageId());
             user.setEvalGroupId(evalGroup.getId());