Merge branch 'test' into 'main'

日志抽取修改日志抽取修改 See merge request !121

Merge branch 'test' into 'main'
日志抽取修改日志抽取修改 See merge request !121
姜超
2 parents 87a724e7 d8b80418
Showing 2 changed files with 5 additions and 2 deletions
fw-morax-server/src/main/java/cn/fw/morax/server/task/EvalUserReportTask.java
fw-morax-service/src/main/java/cn/fw/morax/service/biz/kpi/KpiPoolBizService.java
@@ -76,7 +76,7 @@ public class EvalUserReportTask {
     @Scheduled(cron = TimeTaskConstant.EVAL_REPORT)
     @Transactional(rollbackFor = Exception.class)
     public void evalUserReportTask() {
-        this.evalUserReport(LocalDate.now().minusDays(1));
+//        this.evalUserReport(LocalDate.now().minusDays(1));
     }
  
     /**
@@ -640,7 +640,10 @@ public class KpiPoolBizService {
             }
         }
         //奖励分正数、惩罚分负数，减去奖惩分数，得到原始分数
-        BigDecimal originKpiScore = kpiPoolDetailVO.getOriginKpiScore().subtract(rewardScore).subtract(punishScore);
+        BigDecimal originKpiScore = pool.getKpiScore().subtract(rewardScore).subtract(punishScore);
+        if (BigDecimal.ZERO.compareTo(originKpiScore) > 0) {
+            originKpiScore = BigDecimal.ZERO;
+        }
         kpiPoolDetailVO.setRewardScore(rewardScore);
         kpiPoolDetailVO.setPunishScore(punishScore.abs());
         kpiPoolDetailVO.setRealKpiScore(pool.getKpiScore());