From 2806f8efedbd9f2d534c2fccac3e7288684a51a9 Mon Sep 17 00:00:00 2001 From: jiangchao Date: Thu, 9 Mar 2023 17:55:51 +0800 Subject: [PATCH] feature(bug): 计算试用期工资bug --- fw-morax-service/src/main/java/cn/fw/morax/service/biz/salary/SalaryCalcService.java | 3 +++ 1 file changed, 3 insertions(+), 0 deletions(-) diff --git a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/salary/SalaryCalcService.java b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/salary/SalaryCalcService.java index 0b1c993..12b71cd 100644 --- a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/salary/SalaryCalcService.java +++ b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/salary/SalaryCalcService.java @@ -29,6 +29,8 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDate; import java.time.YearMonth; +import java.time.temporal.TemporalAdjuster; +import java.time.temporal.TemporalAdjusters; import java.util.*; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.ThreadPoolExecutor; @@ -408,6 +410,7 @@ public class SalaryCalcService { .eq(SalaryGroupUser::getProbationer, Boolean.TRUE) .eq(SalaryGroupUser::getFrozen, Boolean.FALSE) .eq(SalaryGroupUser::getYn, Boolean.TRUE) + .ge(SalaryGroupUser::getDataDate, user.getDataDate().with(TemporalAdjusters.firstDayOfMonth())) .le(SalaryGroupUser::getDataDate, user.getDataDate()) ); if (count <= 0) { -- libgit2 0.22.2