From ee14b0435b2f154f69a8a4f3017639d6686cfb7a Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Thu, 15 Jun 2023 16:18:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E9=94=AE=E7=B4=AF=E8=AE=A1=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../timer/AutoAddAllSpecialAddDeductionJob.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/com/engine/salary/timer/AutoAddAllSpecialAddDeductionJob.java b/src/com/engine/salary/timer/AutoAddAllSpecialAddDeductionJob.java index 4de300e71..f08fe4b3a 100644 --- a/src/com/engine/salary/timer/AutoAddAllSpecialAddDeductionJob.java +++ b/src/com/engine/salary/timer/AutoAddAllSpecialAddDeductionJob.java @@ -4,10 +4,13 @@ import cn.hutool.core.date.DateUtil; import com.engine.common.util.ServiceUtil; import com.engine.salary.service.AddUpDeductionService; import com.engine.salary.service.impl.AddUpDeductionServiceImpl; +import com.engine.salary.util.SalaryDateUtil; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import weaver.hrm.User; import weaver.interfaces.schedule.BaseCronJob; +import java.time.LocalDate; import java.util.Date; @Slf4j @@ -17,9 +20,14 @@ public class AutoAddAllSpecialAddDeductionJob extends BaseCronJob { return ServiceUtil.getService(AddUpDeductionServiceImpl.class, user); } + private String salaryTaxMonth; + @Override public void execute() { - Date date = new Date(); - getAddUpDeductionService(null).autoAddAll(DateUtil.beginOfMonth(date), Boolean.TRUE); + LocalDate localDate = SalaryDateUtil.dateToLocalDate(new Date()); + if(StringUtils.isNotBlank(salaryTaxMonth)){ + localDate = localDate.plusMonths(Integer.valueOf(salaryTaxMonth.trim())); + } + getAddUpDeductionService(null).autoAddAll(DateUtil.beginOfMonth(SalaryDateUtil.localDateToDate(localDate)), Boolean.TRUE); } }