KPI / fw-morax

Commit bc486aa06a04f69633787030ddcb97750509982e

Authored by 姜超
2 parents b473108d 12dad417

Merge branch 'bug-fix' into 'main' 

feature(*): 修改绩效得分率计算

修改绩效得分率计算

See merge request !610
Inline Side-by-side
Showing 2 changed files with 3 additions and 3 deletions
fw-morax-service/src/main/java/cn/fw/morax/service/biz/kpi/KpiCalculateService.java
  View file @bc486aa
... ... @@ -317,7 +317,7 @@ public class KpiCalculateService {
317 317 for (KpiPool pool : kpiPools) {
318 318 BigDecimal kpiScore = Optional.ofNullable(pool.getKpiScore()).orElse(BigDecimal.ZERO);
319 319 BigDecimal kpiScoreRatio = BigDecimal.ZERO;
320   - List<KpiPoolIndicatorValueVO> indicatorValueVos = kpiPoolIndicatorValueService.getStaffIndicatorValue(pool.getUserId(), pool.getKpiGroupId(), pool.getDataDate());
  320 + List<KpiPoolIndicatorValueVO> indicatorValueVos = kpiPoolIndicatorValueService.getStaffIndicatorValue(pool.getId(), pool.getKpiGroupId(), pool.getDataDate());
321 321 if (PublicUtil.isNotEmpty(indicatorValueVos)) {
322 322 BigDecimal totalScore = indicatorValueVos.stream().map(KpiPoolIndicatorValueVO::getBaseScore).reduce(BigDecimal.ZERO, BigDecimal::add);
323 323 kpiScoreRatio = kpiScore.divide(totalScore, 4, RoundingMode.HALF_UP);
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/data/kpi/KpiPoolIndicatorValueService.java
  View file @bc486aa
... ... @@ -20,12 +20,12 @@ public interface KpiPoolIndicatorValueService extends IService&lt;KpiPoolIndicatorV
20 20  
21 21 /**
22 22 * 获取员工某月指标记录
23   - * @param userId
  23 + * @param kpiPoolId
24 24 * @param kpiGroupId
25 25 * @param localDate
26 26 * @return
27 27 */
28   - List<KpiPoolIndicatorValueVO> getStaffIndicatorValue(Long userId, Long kpiGroupId, LocalDate localDate);
  28 + List<KpiPoolIndicatorValueVO> getStaffIndicatorValue(Long kpiPoolId, Long kpiGroupId, LocalDate localDate);
29 29  
30 30  
31 31 /**
... ...