KPI / fw-morax

Commit 2806f8efedbd9f2d534c2fccac3e7288684a51a9

Authored by 姜超
1 parent 529e593a

feature(bug): 计算试用期工资bug 

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