feature(*): 修改个人考评

修改个人考评

feature(*): 修改个人考评
修改个人考评
姜超
1 parent 320f8884
Showing 13 changed files with 260 additions and 60 deletions
doc/2023-05-18_update.sql
fw-morax-dao/src/main/resources/mapper/eval/EvalGroupIndicatorTargetHitLogMapper.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/EvalGroupIndicatorTargetHitLog.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/enums/EvalUseTargetEnum.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/eval/EvalGroupIndicatorParamVO.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/eval/EvalGroupIndicatorTargetHitLogVO.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/eval/EvalUserPoolVO.java
fw-morax-rpc/src/main/java/cn/fw/morax/rpc/ehr/EhrRpcService.java
fw-morax-server/src/main/java/cn/fw/morax/server/task/EvalUserReportTask.java
fw-morax-service/src/main/java/cn/fw/morax/service/biz/calculator/eval/kpi/EvalKpiBaseCalculator.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/EvalRewardService.java
@@ -4,3 +4,8 @@ ALTER TABLE `fw_morax`.`eval_user_pool`
     CHANGE COLUMN `eval_group_stage_id` `eval_group_rank_stage_id` bigint(20) NOT NULL COMMENT '考评阶段id' AFTER `eval_group_rank_id`;
 ALTER TABLE `fw_morax`.`eval_group_user`
     ADD COLUMN `eval_group_rank_stage_id` bigint(20) NOT NULL COMMENT '考评排名组阶段id' AFTER `eval_group_rank_id`;
+
+-- 2023年5月23日
+ALTER TABLE `fw_morax`.`eval_group_indicator_target_hit_log`
+    ADD COLUMN `extra_reach_value` decimal(18, 4) NULL COMMENT '额外达成目标' AFTER `reach_value`,
+ADD COLUMN `use_target` tinyint(4) NULL DEFAULT 1 COMMENT '考评使用目标; 1:无目标 2:第一目标 3:额外目标值' AFTER `extra_reach_value`;
@@ -9,6 +9,8 @@
                 <result column="target_type" property="targetType"/>
                 <result column="value" property="value"/>
                 <result column="reach_value" property="reachValue"/>
+                <result column="extra_reach_value" property="extraReachValue"/>
+                <result column="use_target" property="useTarget"/>
                 <result column="data_date" property="dataDate"/>
                 <result column="group_id" property="groupId"/>
                 <result column="create_time" property="createTime"/>
@@ -24,6 +26,8 @@
             t1.`pool_id`,
             t1.`value` AS `value`,
             t1.`reach_value`,
+            t1.`extra_reach_value`,
+            t1.`use_target`,
             t1.`data_date`,
             t1.`group_id`
         FROM
@@ -65,6 +65,11 @@ public class EvalGroupUserShop {
      */
     private Long referId;
+//    /**
+//     * 多阶段
+//     */
+//    private Boolean multiStage;
+
     /**
      * 数据开始日期
      */
@@ -2,6 +2,7 @@ package cn.fw.morax.domain.db.eval;
 import cn.fw.common.data.entity.BaseAuditableTimeEntity;
 import cn.fw.morax.domain.enums.EvalScopeEnum;
+import cn.fw.morax.domain.enums.EvalUseTargetEnum;
 import cn.fw.morax.domain.enums.IndicatorTypeEnum;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -60,6 +61,16 @@ public class EvalGroupIndicatorTargetHitLog extends BaseAuditableTimeEntity&lt;Eval
     private BigDecimal reachValue;
     /**
+     * 额外达成目标
+     */
+    private BigDecimal extraReachValue;
+
+    /**
+     * 考评使用目标; 1:无目标 2:第一目标 3:额外目标值
+     */
+    private EvalUseTargetEnum useTarget;
+
+    /**
      * 数据日期
      */
     private LocalDate dataDate;
+package cn.fw.morax.domain.enums;
+
+import com.baomidou.mybatisplus.core.enums.IEnum;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.Getter;
+
+/**
+ * 考评使用目标
+ *
+ * @author kurisu
+ */
+public enum EvalUseTargetEnum implements IEnum<Integer> {
+    /**
+     * 考评使用目标; 1:无目标 2:第一目标 3:额外目标值
+     */
+    NO(1, "无目标"),
+    FIRST_TARGET(2, "第一目标"),
+    EXTRA_TARGET(2, "额外目标值"),
+    ;
+
+    /**
+     * 值
+     */
+    private final Integer value;
+    /**
+     * 名称
+     */
+    @Getter
+    private final String name;
+
+    EvalUseTargetEnum(final Integer value, final String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    /**
+     * 根据枚举值获取枚举对象
+     */
+    @JsonCreator
+    public static EvalUseTargetEnum ofValue(final Integer value) {
+        for (final EvalUseTargetEnum _enum : EvalUseTargetEnum.values()) {
+            if (_enum.value.equals(value)) {
+                return _enum;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 获取值
+     *
+     * @return 值
+     */
+    @JsonValue
+    @Override
+    public Integer getValue() {
+        return value;
+    }
+
+    /**
+     * 获取描述
+     *
+     * @return 值
+     */
+    @JsonCreator
+    public static String getNameByVale(final Integer value) {
+        for (final EvalUseTargetEnum _enum : EvalUseTargetEnum.values()) {
+            if (_enum.value.equals(value)) {
+                return _enum.getName();
+            }
+        }
+        return "";
+    }
+}
@@ -93,14 +93,24 @@ public class EvalGroupIndicatorParamVO {
     private BigDecimal indicatorValue;
     /**
-     * 达成值
+     * 达成目标
      */
     private BigDecimal reachValue;
     /**
+     * 额外达成目标
+     */
+    private BigDecimal extraReachValue;
+
+    /**
+     * 考评使用目标; 1:无目标 2:第一目标 3:额外目标值
+     */
+    private EvalUseTargetEnum useTarget;
+
+    /**
      * 时间进度目标值
      */
-    private BigDecimal timeScheduleTargetValue;
+//    private BigDecimal timeScheduleTargetValue;
     /**
      * 目标计算类型;1: 目标值计算 2:最低要求计算 3:阶段目标 4:时间进度
@@ -2,6 +2,7 @@ package cn.fw.morax.domain.vo.eval;
 import cn.fw.common.data.entity.BaseAuditableTimeEntity;
 import cn.fw.morax.domain.enums.EvalScopeEnum;
+import cn.fw.morax.domain.enums.EvalUseTargetEnum;
 import cn.fw.morax.domain.enums.IndicatorTypeEnum;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -56,6 +57,16 @@ public class EvalGroupIndicatorTargetHitLogVO extends BaseAuditableTimeEntity&lt;Ev
     private BigDecimal reachValue;
     /**
+     * 额外达成目标
+     */
+    private BigDecimal extraReachValue;
+
+    /**
+     * 考评使用目标; 1:无目标 2:第一目标 3:额外目标值
+     */
+    private EvalUseTargetEnum useTarget;
+
+    /**
      * 数据日期
      */
     private LocalDate dataDate;
@@ -111,9 +111,22 @@ public class EvalUserPoolVO {
     private BigDecimal reward;
     /**
-     * 考评得分
+     * 本月考评得分（最终得分）
      */
     private BigDecimal score;
+    /**
+     * 原始考评得分（无奖惩分）
+     */
+    private BigDecimal originScore;
+
+    /**
+     * 奖励绩效分
+     */
+    private BigDecimal rewardScore;
+    /**
+     * 惩罚绩效分
+     */
+    private BigDecimal punishScore;
     /**
      * 考评得分率
@@ -248,7 +248,7 @@ public class EhrRpcService {
         }
         try {
             final Message<ManagerVo> msg = managerApi.getRealTimeManagerLeaveScope(null, staffId, startLeaveTime.getTime(), endLeaveTime.getTime());
-            log.info("ManagerApi.getRealTimeManagerScope: msg.code={}, msg.result={}, msg.data={}", msg.getCode(), msg.getResult(), msg.getData());
+            log.info("ManagerApi.getRealTimeManagerLeaveScope: msg.code={}, msg.result={}, msg.data={}", msg.getCode(), msg.getResult(), msg.getData());
             if (msg.isSuccess() && !Objects.isNull(msg.getData())) {
                 return this.convertStaffBaseDTOs(msg.getData().getManageStaffList());
             }
@@ -96,8 +96,8 @@ public class EvalUserReportTask {
         TransactionStatus transactionStatus = platformTransactionManager.getTransaction(transactionDefinition);
         try {
             log.info("定时任务【考评人员报表数据抽取】开始执行");
-            Map<Long, List<EvalGroupRank>> groupKpiGroupMap = queryStaffEffectRank(date);
-            for (Map.Entry<Long, List<EvalGroupRank>> entry : groupKpiGroupMap.entrySet()) {
+            Map<Long, List<EvalGroupRank>> groupEvalGroupMap = queryEffectRank(date);
+            for (Map.Entry<Long, List<EvalGroupRank>> entry : groupEvalGroupMap.entrySet()) {
                 for (EvalGroupRank rank : entry.getValue()) {
                     //清除当月数据（当月只有一条数据）
                     cleanRankCurMonthData(rank.getId(), date);
@@ -400,8 +400,13 @@ public class EvalUserReportTask {
         return rankCodes;
     }
-    public Map<Long, List<EvalGroupRank>> queryStaffEffectRank(LocalDate date) {
+    public Map<Long, List<EvalGroupRank>> queryEffectRank(LocalDate date) {
+        List<SettingStatusEnum> status = new ArrayList<SettingStatusEnum>(){{
+            add(SettingStatusEnum.EFFECTIVE);
+            add(SettingStatusEnum.BE_EFFECTIVE);
+        }};
         List<EvalGroupRank> evalGroupRanks = evalGroupRankService.list(Wrappers.<EvalGroupRank>lambdaQuery()
+                .in(EvalGroupRank::getStatus, status)
                 .ge(EvalGroupRank::getOverTime, date)
                 .eq(EvalGroupRank::getYn, Boolean.TRUE)
         );
@@ -80,9 +80,12 @@ public abstract class EvalKpiBaseCalculator implements Calculator&lt;EvalGroupUserS
             if (! valueOptional.isPresent()) {
                 return BigDecimal.ZERO;
             }
-            final BigDecimal originValue = valueOptional.get();//queryIndicatorValue(precondition.getCode(), valueOptional.get());
+            final BigDecimal originValue = valueOptional.get();
             BigDecimal indicatorValue = originValue;
+            EvalUseTargetEnum useTarget = EvalUseTargetEnum.NO;
+
             if (!TargetTypeEnum.NO.equals(targetType)) {
+                useTarget = EvalUseTargetEnum.FIRST_TARGET;
                 BigDecimal targetValue = precondition.getTargetValue();
                 if (TargetCalcTypeEnum.TARGET_VALUE.equals(targetCalcType) || TargetCalcTypeEnum.STAGE_TARGET.equals(targetCalcType)) {
                     indicatorValue = indicatorValue.divide(targetValue, 4, RoundingMode.HALF_UP);
@@ -98,9 +101,13 @@ public abstract class EvalKpiBaseCalculator implements Calculator&lt;EvalGroupUserS
                         indicatorValue = userDiffValue.divide(difference, 4, RoundingMode.HALF_UP);
                     }
                 }
-
-                saveTargetHitLog(obj, precondition.getId(), IndicatorTypeEnum.PRE, originValue, indicatorValue);
             }
+
+            EvalGroupIndicatorTargetHitLog log = new EvalGroupIndicatorTargetHitLog();
+            log.setValue(originValue);
+            log.setReachValue(indicatorValue);
+            log.setUseTarget(useTarget);
+            saveTargetHitLog(obj, precondition.getId(), IndicatorTypeEnum.PRE, originValue, log);
             coefficient = coefficient(obj, precondition.getId(), indicatorValue);
         }
         return coefficient;
@@ -152,20 +159,30 @@ public abstract class EvalKpiBaseCalculator implements Calculator&lt;EvalGroupUserS
             TargetTypeEnum targetType = param.getTargetType();
             TargetTypeEnum extraTargetType = param.getExtraTargetType();
             final BigDecimal originValue = valueOptional.get();
-            BigDecimal indicatorValue = null;
-            BigDecimal extraIndicatorValue = null;
-            if (!TargetTypeEnum.NO.equals(targetType)) {
-                indicatorValue = calcTarget(param.getTargetCalcType(), originValue, param.getTargetValue());
+            BigDecimal indicatorValue = originValue;
+            BigDecimal reachValue = BigDecimal.ZERO;
+            BigDecimal extraReachValue = BigDecimal.ZERO;
+            EvalUseTargetEnum useTarget = EvalUseTargetEnum.NO;
+
+            if (PublicUtil.isNotEmpty(targetType) && !TargetTypeEnum.NO.equals(targetType)) {
+                reachValue = calcTarget(param.getTargetCalcType(), originValue, param.getTargetValue());
+                useTarget = EvalUseTargetEnum.FIRST_TARGET;
+                indicatorValue = reachValue;
             }
             if (PublicUtil.isNotEmpty(extraTargetType) && (!TargetTypeEnum.NO.equals(extraTargetType))) {
-                extraIndicatorValue = calcTarget(param.getExtraTargetCalcType(), originValue, param.getExtraTargetValue());
+                extraReachValue = calcTarget(param.getExtraTargetCalcType(), originValue, param.getExtraTargetValue());
                 //额外计算类型值  原始计算类型值  用大的那个值
-                if (PublicUtil.isEmpty(indicatorValue) || (extraIndicatorValue.compareTo(indicatorValue) > 0)) {
-                    indicatorValue = extraIndicatorValue;
+                if (PublicUtil.isEmpty(reachValue) || (extraReachValue.compareTo(reachValue) > 0)) {
+                    indicatorValue = extraReachValue;
+                    useTarget = EvalUseTargetEnum.EXTRA_TARGET;
                 }
             }
-
-            saveTargetHitLog(userShop, param.getId(), IndicatorTypeEnum.EXAMINE, originValue, indicatorValue);
+            EvalGroupIndicatorTargetHitLog log = new EvalGroupIndicatorTargetHitLog();
+            log.setValue(originValue);
+            log.setReachValue(reachValue);
+            log.setExtraReachValue(extraReachValue);
+            log.setUseTarget(useTarget);
+            saveTargetHitLog(userShop, param.getId(), IndicatorTypeEnum.EXAMINE, originValue, log);
             boolean isCap = Boolean.TRUE.equals(param.getCap());
             BigDecimal proportion = param.getProportion();
@@ -281,6 +298,26 @@ public abstract class EvalKpiBaseCalculator implements Calculator&lt;EvalGroupUserS
     /**
      * 查询具体指标值
      *
+     * @param indicatorUserValue
+     * @return
+     */
+    protected Optional<BigDecimal> queryKpiIndicatorValue(IndicatorUserValue indicatorUserValue) {
+        if (PublicUtil.isEmpty(indicatorUserValue) || PublicUtil.isEmpty(indicatorUserValue.getIndicatorValue())) {
+            return Optional.empty();
+        }
+        BigDecimal value = BigDecimal.ZERO;
+        try {
+            JSONObject jsonObject = JSONObject.parseObject(indicatorUserValue.getIndicatorValue());
+            value = Optional.ofNullable(jsonObject.getBigDecimal(indicatorUserValue.getIndicatorCode())).orElse(BigDecimal.ZERO);
+        } catch (Exception e) {
+            log.error("[{}]指标值转化失败", indicatorUserValue, e);
+        }
+        return Optional.of(value);
+    }
+
+    /**
+     * 查询具体指标值
+     *
      * @param indicatorCode
      * @param originalValue
      * @return
@@ -318,6 +355,25 @@ public abstract class EvalKpiBaseCalculator implements Calculator&lt;EvalGroupUserS
         preconditionHitLogService.save(hitLog);
     }
+    protected void saveTargetHitLog(EvalGroupUserShop userShop, Long referId, IndicatorTypeEnum targetType, BigDecimal value, EvalGroupIndicatorTargetHitLog log) {
+        evalGroupIndicatorTargetHitLogService.remove(Wrappers.<EvalGroupIndicatorTargetHitLog>lambdaQuery()
+                .eq(EvalGroupIndicatorTargetHitLog::getPoolId, userShop.getPoolId())
+                .eq(EvalGroupIndicatorTargetHitLog::getScopeType, userShop.getScopeType())
+                .eq(EvalGroupIndicatorTargetHitLog::getTargetType, targetType)
+                .eq(EvalGroupIndicatorTargetHitLog::getDataDate, userShop.getDataDate())
+                .eq(EvalGroupIndicatorTargetHitLog::getReferId, referId)
+        );
+        log.setPoolId(userShop.getPoolId());
+        log.setScopeType(userShop.getScopeType());
+        log.setReferId(referId);
+        log.setTargetType(targetType);
+        log.setValue(value);
+        log.setDataDate(userShop.getDataDate());
+        log.setGroupId(userShop.getGroupId());
+        log.setYn(Boolean.TRUE);
+        evalGroupIndicatorTargetHitLogService.save(log);
+    }
+
     protected void saveTargetHitLog(EvalGroupUserShop userShop, Long referId, IndicatorTypeEnum targetType, BigDecimal value, BigDecimal reachValue) {
         evalGroupIndicatorTargetHitLogService.remove(Wrappers.<EvalGroupIndicatorTargetHitLog>lambdaQuery()
                 .eq(EvalGroupIndicatorTargetHitLog::getPoolId, userShop.getPoolId())
@@ -333,6 +389,7 @@ public abstract class EvalKpiBaseCalculator implements Calculator&lt;EvalGroupUserS
         log.setTargetType(targetType);
         log.setValue(value);
         log.setReachValue(reachValue);
+        log.setUseTarget(EvalUseTargetEnum.FIRST_TARGET);
         log.setDataDate(userShop.getDataDate());
         log.setGroupId(userShop.getGroupId());
         log.setYn(Boolean.TRUE);
@@ -134,6 +134,7 @@ public class EvalGroupPoolService {
             if (PublicUtil.isNotEmpty(rankPools)) {
                 EvalUserPool stagePool = rankPools.get(0);
                 EvalUserPoolVO evalUserPoolVO = this.poolDetail(stagePool);
+                this.setRewardPunish(evalUserPoolVO);
                 stageVO.setPool(evalUserPoolVO);
             }
         }
@@ -154,6 +155,12 @@ public class EvalGroupPoolService {
         return evalUserPoolVO;
     }
+    public void setRewardPunish(EvalUserPoolVO evalUserPoolVO) {
+        evalUserPoolVO.setRewardScore(BigDecimal.ZERO);
+        evalUserPoolVO.setPunishScore(BigDecimal.ZERO);
+        evalUserPoolVO.setOriginScore(evalUserPoolVO.getScore());
+    }
+
     public void setIgnore(EvalUserPoolVO pool) {
         EvalGroupUser evalGroupUser = evalGroupUserService.getMonthLastData(pool.getEvalGroupId(), pool.getUserId(), pool.getMonthly());
         if (PublicUtil.isEmpty(evalGroupUser)) {
@@ -539,16 +546,18 @@ public class EvalGroupPoolService {
             String code = paramVO.getCode();
             Long paramId = paramVO.getId();
             //无目标
-            if (TargetTypeEnum.NO.equals(paramVO.getTargetType())) {
-                BigDecimal indicatorOriginValue = queryUserOriginValue(code, referId, scopeType,dataDate, paramVO.getCodeType());
-                paramVO.setIndicatorValue(indicatorOriginValue);
-                continue;
-            }
+//            if (TargetTypeEnum.NO.equals(paramVO.getTargetType())) {
+//                BigDecimal indicatorOriginValue = queryUserOriginValue(code, referId, scopeType,dataDate, paramVO.getCodeType());
+//                paramVO.setIndicatorValue(indicatorOriginValue);
+//                continue;
+//            }
             //有目标
             Optional<EvalGroupIndicatorTargetHitLog> hitLogOptional = Optional.ofNullable(paramTargetHitLogMap.get(paramId));
             paramVO.setIndicatorValue(hitLogOptional.map(EvalGroupIndicatorTargetHitLog::getValue).orElse(BigDecimal.ZERO));
             paramVO.setReachValue(hitLogOptional.map(EvalGroupIndicatorTargetHitLog::getReachValue).orElse(BigDecimal.ZERO));
+            paramVO.setExtraReachValue(hitLogOptional.map(EvalGroupIndicatorTargetHitLog::getReachValue).orElse(BigDecimal.ZERO));
+            paramVO.setUseTarget(hitLogOptional.map(EvalGroupIndicatorTargetHitLog::getUseTarget).orElse(EvalUseTargetEnum.NO));
         }
         Map<ParamTypeEnum, List<EvalGroupIndicatorParamVO>> indicatorParamMap = paramVos.stream()
@@ -560,23 +569,21 @@ public class EvalGroupPoolService {
                                                                     EvalScopeEnum scopeType,
                                                                     LocalDate dataDate,
                                                                     List<EvalGroupIndicatorParamVO> paramVos) {
-        List<Long> hasTargetParamIds = paramVos.stream()
-                .filter(param -> (! TargetTypeEnum.NO.equals(param.getTargetType())))
-                .map(EvalGroupIndicatorParamVO::getId).collect(Collectors.toList());
+//        List<Long> hasTargetParamIds = paramVos.stream()
+//                .filter(param -> (! TargetTypeEnum.NO.equals(param.getTargetType())))
+//                .map(EvalGroupIndicatorParamVO::getId).collect(Collectors.toList());
         Map<Long, EvalGroupIndicatorTargetHitLog> paramTargetHitLogMap = new HashMap<>();
-        if (PublicUtil.isNotEmpty(hasTargetParamIds)) {
-            List<EvalGroupIndicatorTargetHitLog> targetHitLogs = evalGroupIndicatorTargetHitLogService.list(Wrappers.<EvalGroupIndicatorTargetHitLog>lambdaQuery()
-                    .in(EvalGroupIndicatorTargetHitLog::getReferId, hasTargetParamIds)
-                    .in(EvalGroupIndicatorTargetHitLog::getTargetType, IndicatorTypeEnum.EXAMINE)
-                    .eq(EvalGroupIndicatorTargetHitLog::getDataDate, dataDate)
-                    .eq(EvalGroupIndicatorTargetHitLog::getPoolId, poolId)
-                    .eq(EvalGroupIndicatorTargetHitLog::getScopeType, scopeType)
-                    .eq(EvalGroupIndicatorTargetHitLog::getYn, Boolean.TRUE)
-            );
-            paramTargetHitLogMap = targetHitLogs.stream()
-                    .collect(Collectors.toMap(EvalGroupIndicatorTargetHitLog::getReferId, Function.identity(), (v1, v2) -> v1));
-        }
+        List<EvalGroupIndicatorTargetHitLog> targetHitLogs = evalGroupIndicatorTargetHitLogService.list(Wrappers.<EvalGroupIndicatorTargetHitLog>lambdaQuery()
+//                .in(EvalGroupIndicatorTargetHitLog::getReferId, hasTargetParamIds)
+                .in(EvalGroupIndicatorTargetHitLog::getTargetType, IndicatorTypeEnum.EXAMINE)
+                .eq(EvalGroupIndicatorTargetHitLog::getDataDate, dataDate)
+                .eq(EvalGroupIndicatorTargetHitLog::getPoolId, poolId)
+                .eq(EvalGroupIndicatorTargetHitLog::getScopeType, scopeType)
+                .eq(EvalGroupIndicatorTargetHitLog::getYn, Boolean.TRUE)
+        );
+        paramTargetHitLogMap = targetHitLogs.stream()
+                .collect(Collectors.toMap(EvalGroupIndicatorTargetHitLog::getReferId, Function.identity(), (v1, v2) -> v1));
         return paramTargetHitLogMap;
     }
@@ -169,7 +169,7 @@ public class EvalRewardService {
             log.error("考评奖惩没有门店：{}", JSON.toJSONString(evalGroup));
             return;
         }
-        sendDistRewardTodo(shopRewardDims, evalGroup, evalGroupRank, evalGroupRankStage);
+//        sendDistRewardTodo(shopRewardDims, evalGroup, evalGroupRank, evalGroupRankStage);
     }
     /**
@@ -190,6 +190,7 @@ public class EvalRewardService {
         for (EvalGroupRewardDim rewardDim : shopRewardDims) {
             final String roleCode = rewardDim.getDistRoleCode();
             List<EvalShopPool> pools = evalShopPoolService.list(Wrappers.<EvalShopPool>lambdaQuery()
+                .ne(EvalShopPool::getReward, BigDecimal.ZERO)
                 .eq(EvalShopPool::getEvalGroupId, evalGroup.getId())
                 .in(EvalShopPool::getShopId, rewardDim.getShopIds())
                 .eq(EvalShopPool::getYn, Boolean.TRUE)
@@ -198,9 +199,7 @@ public class EvalRewardService {
                 log.error("分配奖惩待办，未找到考评池：{}", JSON.toJSONString(rewardDim));
                 continue;
             }
-            List<Long> distShopIds = pools.stream().filter(pool -> pool.getReward().compareTo(BigDecimal.ZERO) == 0)
-                    .map(EvalShopPool::getShopId).collect(Collectors.toList());
-
+            List<Long> distShopIds = pools.stream().map(EvalShopPool::getShopId).collect(Collectors.toList());
             List<RpcUserRoleInfoDTO> users = this.getUserEnableRoleInfos(roleCode, distShopIds);
             for (RpcUserRoleInfoDTO user : users) {
                 List<Long> manageShopIds = user.getRangeList().stream()
@@ -249,25 +248,23 @@ public class EvalRewardService {
                 planItemReq.setExtraData(extraData);
                 itemList.add(planItemReq);
             }
-
-        }
-
-
-        //推送待办
-        BacklogBatchPlanReqDTO batchPlanReq = new BacklogBatchPlanReqDTO(todoVal.getDistEvalReward(), itemList);
-        List<FailBacklogItem> failItems = Optional.ofNullable(todoRpcService.batchPush(batchPlanReq)).orElse(new ArrayList<>());
-        if (PublicUtil.isNotEmpty(failItems)) {
-            log.error("发送分配考评奖励待办失败，失败人员信息：{}", JSON.toJSONString(failItems));
         }
+        if (PublicUtil.isNotEmpty(itemList)) {
+            //推送待办
+            BacklogBatchPlanReqDTO batchPlanReq = new BacklogBatchPlanReqDTO(todoVal.getDistEvalReward(), itemList);
+            List<FailBacklogItem> failItems = Optional.ofNullable(todoRpcService.batchPush(batchPlanReq)).orElse(new ArrayList<>());
+            if (PublicUtil.isNotEmpty(failItems)) {
+                log.error("发送分配考评奖励待办失败，失败人员信息：{}", JSON.toJSONString(failItems));
+            }
-        if (PublicUtil.isEmpty(failItems) || itemList.size() > failItems.size()) {
-            if (PublicUtil.isNotEmpty(distPoolIds)) {
-                evalShopPoolService.update(Wrappers.<EvalShopPool>lambdaUpdate()
-                        .in(EvalShopPool::getId, distPoolIds)
-                        .set(EvalShopPool::getStatus, EvalShopPoolStatusEnum.WAIT_DIST_REWARD)
-                        .set(EvalShopPool::getYn, Boolean.FALSE)
-                        .set(EvalShopPool::getUpdateTime, new Date())
-                );
+            if (PublicUtil.isEmpty(failItems) || itemList.size() > failItems.size()) {
+                if (PublicUtil.isNotEmpty(distPoolIds)) {
+                    evalShopPoolService.update(Wrappers.<EvalShopPool>lambdaUpdate()
+                            .in(EvalShopPool::getId, distPoolIds)
+                            .set(EvalShopPool::getStatus, EvalShopPoolStatusEnum.WAIT_DIST_REWARD)
+                            .set(EvalShopPool::getUpdateTime, new Date())
+                    );
+                }
             }
         }
     }