Commit 67f6a578d922c5f20d9f188080d6204d6d1020ec
Merge branch 'main' into mr-eval-report-staff-dim-2024-4-2
Showing
3 changed files
with
12 additions
and
4 deletions
fw-morax-service/src/main/java/cn/fw/morax/service/biz/calculator/salary/StarSalaryCalculator.java
... | ... | @@ -62,7 +62,7 @@ public class StarSalaryCalculator extends SalaryBaseCalculator { |
62 | 62 | //只能查询指定日期月份人员岗位纬度的最新星级 |
63 | 63 | Optional<KpiPool> optionalKpiPool = kpiPoolCommonService.queryPool(param2); |
64 | 64 | if (! optionalKpiPool.isPresent()) { |
65 | - log.error("用户[{}]的绩效数据不存在", userId); | |
65 | +// log.error("用户[{}]的绩效数据不存在", userId); | |
66 | 66 | return BigDecimal.ZERO; |
67 | 67 | } |
68 | 68 | KpiPool kpiPool = optionalKpiPool.get(); | ... | ... |
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalCalculateTaskService.java
... | ... | @@ -910,6 +910,14 @@ public class EvalCalculateTaskService { |
910 | 910 | add(LocalDate.now().minusDays(2)); |
911 | 911 | add(LocalDate.now().minusDays(3)); |
912 | 912 | add(LocalDate.now().minusDays(4)); |
913 | + add(LocalDate.now().minusDays(5)); | |
914 | + add(LocalDate.now().minusDays(6)); | |
915 | + add(LocalDate.now().minusDays(7)); | |
916 | + add(LocalDate.now().minusDays(8)); | |
917 | + add(LocalDate.now().minusDays(9)); | |
918 | + add(LocalDate.now().minusDays(10)); | |
919 | + add(LocalDate.now().minusDays(11)); | |
920 | + add(LocalDate.now().minusDays(12)); | |
913 | 921 | }}; |
914 | 922 | return calcDates; |
915 | 923 | } | ... | ... |
fw-morax-service/src/main/java/cn/fw/morax/service/biz/kpi/KpiPoolCommonService.java
... | ... | @@ -89,7 +89,7 @@ public class KpiPoolCommonService { |
89 | 89 | .eq(KpiPool::getYn, Boolean.TRUE) |
90 | 90 | , Boolean.FALSE); |
91 | 91 | if (PublicUtil.isEmpty(kpiPool)) { |
92 | - log.error("绩效数据不存在,用户:{}", JSON.toJSONString(user)); | |
92 | +// log.error("绩效数据不存在,用户:{}", JSON.toJSONString(user)); | |
93 | 93 | // throw new BusinessException("用户[" + user.getUserId() + "]的绩效数据不存在"); |
94 | 94 | } |
95 | 95 | return Optional.ofNullable(kpiPool); |
... | ... | @@ -110,7 +110,7 @@ public class KpiPoolCommonService { |
110 | 110 | .eq(KpiPool::getYn, Boolean.TRUE) |
111 | 111 | , Boolean.FALSE); |
112 | 112 | if (PublicUtil.isEmpty(kpiPool)) { |
113 | - log.error("绩效数据不存在,薪酬池:{}", JSON.toJSONString(pool)); | |
113 | +// log.error("绩效数据不存在,薪酬池:{}", JSON.toJSONString(pool)); | |
114 | 114 | // throw new BusinessException("用户[" + pool.getUserId() + "]的绩效数据不存在"); |
115 | 115 | } |
116 | 116 | return kpiPool; |
... | ... | @@ -128,7 +128,7 @@ public class KpiPoolCommonService { |
128 | 128 | .eq(KpiPool::getYn, Boolean.TRUE) |
129 | 129 | , Boolean.FALSE); |
130 | 130 | if (PublicUtil.isEmpty(kpiPool)) { |
131 | - log.error("绩效数据不存在,薪酬池:{}", JSON.toJSONString(pool)); | |
131 | +// log.error("绩效数据不存在,薪酬池:{}", JSON.toJSONString(pool)); | |
132 | 132 | // throw new BusinessException("用户[" + pool.getUserId() + "]的绩效数据不存在"); |
133 | 133 | } |
134 | 134 | return kpiPool; | ... | ... |