Commit 2806f8efedbd9f2d534c2fccac3e7288684a51a9
1 parent
529e593a
feature(bug): 计算试用期工资bug
计算试用期工资bug
Showing
1 changed file
with
3 additions
and
0 deletions
fw-morax-service/src/main/java/cn/fw/morax/service/biz/salary/SalaryCalcService.java
@@ -29,6 +29,8 @@ import java.math.BigDecimal; | @@ -29,6 +29,8 @@ import java.math.BigDecimal; | ||
29 | import java.math.RoundingMode; | 29 | import java.math.RoundingMode; |
30 | import java.time.LocalDate; | 30 | import java.time.LocalDate; |
31 | import java.time.YearMonth; | 31 | import java.time.YearMonth; |
32 | +import java.time.temporal.TemporalAdjuster; | ||
33 | +import java.time.temporal.TemporalAdjusters; | ||
32 | import java.util.*; | 34 | import java.util.*; |
33 | import java.util.concurrent.RejectedExecutionException; | 35 | import java.util.concurrent.RejectedExecutionException; |
34 | import java.util.concurrent.ThreadPoolExecutor; | 36 | import java.util.concurrent.ThreadPoolExecutor; |
@@ -408,6 +410,7 @@ public class SalaryCalcService { | @@ -408,6 +410,7 @@ public class SalaryCalcService { | ||
408 | .eq(SalaryGroupUser::getProbationer, Boolean.TRUE) | 410 | .eq(SalaryGroupUser::getProbationer, Boolean.TRUE) |
409 | .eq(SalaryGroupUser::getFrozen, Boolean.FALSE) | 411 | .eq(SalaryGroupUser::getFrozen, Boolean.FALSE) |
410 | .eq(SalaryGroupUser::getYn, Boolean.TRUE) | 412 | .eq(SalaryGroupUser::getYn, Boolean.TRUE) |
413 | + .ge(SalaryGroupUser::getDataDate, user.getDataDate().with(TemporalAdjusters.firstDayOfMonth())) | ||
411 | .le(SalaryGroupUser::getDataDate, user.getDataDate()) | 414 | .le(SalaryGroupUser::getDataDate, user.getDataDate()) |
412 | ); | 415 | ); |
413 | if (count <= 0) { | 416 | if (count <= 0) { |