From 69480c05cbd6ae2626dfe89c8d7ace39c43997b5 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Tue, 12 Mar 2024 13:27:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=89=BE=E5=BF=97=E5=B7=A5=E4=B8=9A=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E4=BF=A1=E6=81=AF=E6=8A=A5=E9=80=81=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../employeedeclare/bo/EmployeeDeclareRefresh.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/engine/salary/entity/employeedeclare/bo/EmployeeDeclareRefresh.java b/src/com/engine/salary/entity/employeedeclare/bo/EmployeeDeclareRefresh.java index 20b9dc603..2e0034e71 100644 --- a/src/com/engine/salary/entity/employeedeclare/bo/EmployeeDeclareRefresh.java +++ b/src/com/engine/salary/entity/employeedeclare/bo/EmployeeDeclareRefresh.java @@ -45,7 +45,7 @@ public class EmployeeDeclareRefresh { // if (Objects.equals(employeeDeclare.getEmploymentStatus(), EmploymentStatusEnum.ABNORMAL.getValue()) // || Objects.equals(Util.null2String(employeeDeclare.getDismissDate()), Util.null2String(salaryArchive.getPayEndDate()))) { if (Objects.equals(employeeDeclare.getEmploymentStatus(), EmploymentStatusEnum.ABNORMAL.getValue()) - || (salaryArchive.getLastPayDate() != null && (!SalaryDateUtil.localDate2YearMonth(salaryArchive.getLastPayDate()).plusMonths(2).isAfter(SalaryDateUtil.localDate2YearMonth(dto.getTaxCycle()))) )) { + || (salaryArchive.getLastPayDate() != null && (!SalaryDateUtil.localDate2YearMonth(salaryArchive.getLastPayDate()).plusMonths(1).isAfter(SalaryDateUtil.localDate2YearMonth(dto.getTaxCycle()))) )) { employeeDeclare.setEmploymentStatus(EmploymentStatusEnum.ABNORMAL.getValue()); employeeDeclare.setDismissDate(salaryArchive.getLastPayDate()); employeeDeclare.setNewEmployeeInfo(1); @@ -79,9 +79,9 @@ public class EmployeeDeclareRefresh { SalaryArchivePO salaryArchive = salaryArchiveMap.get(employeeDeclare.getEmployeeId()); // if (salaryArchive != null && (Objects.equals(salaryArchive.getRunStatus(), SalaryArchiveStatusEnum.STOP_FROM_PENDING.getValue()) // || Objects.equals(salaryArchive.getRunStatus(), SalaryArchiveStatusEnum.STOP_FROM_SUSPEND.getValue()))) { - // 校验 末次发薪日期+2 是否等于或早于当前税款所属期 + // 校验 末次发薪日期+1 是否等于或早于当前税款所属期 if (salaryArchive != null && salaryArchive.getLastPayDate() != null && - (!SalaryDateUtil.localDate2YearMonth(salaryArchive.getLastPayDate()).plusMonths(2) + (!SalaryDateUtil.localDate2YearMonth(salaryArchive.getLastPayDate()).plusMonths(1) .isAfter(SalaryDateUtil.localDate2YearMonth(dto.getTaxCycle())) )) { employeeDeclare.setDeclareStatus(DeclareStatusEnum.NOT_DECLARE.getValue()); employeeDeclare.setEmploymentStatus(EmploymentStatusEnum.ABNORMAL.getValue()); @@ -137,9 +137,9 @@ public class EmployeeDeclareRefresh { employeeDeclare.setEmploymentDate(salaryArchive.getPayStartDate()); // if (Objects.equals(salaryArchive.getRunStatus(), SalaryArchiveStatusEnum.STOP_FROM_PENDING.getValue()) // || Objects.equals(salaryArchive.getRunStatus(), SalaryArchiveStatusEnum.STOP_FROM_SUSPEND.getValue())) { - // 校验 末次发薪日期+2 是否等于或早于当前税款所属期 + // 校验 末次发薪日期+1 是否等于或早于当前税款所属期 if (salaryArchive.getLastPayDate() != null && - (!SalaryDateUtil.localDate2YearMonth(salaryArchive.getLastPayDate()).plusMonths(2) + (!SalaryDateUtil.localDate2YearMonth(salaryArchive.getLastPayDate()).plusMonths(1) .isAfter(SalaryDateUtil.localDate2YearMonth(dto.getTaxCycle()))) ) { employeeDeclare.setEmploymentStatus(EmploymentStatusEnum.ABNORMAL.getValue()); employeeDeclare.setDismissDate(salaryArchive.getLastPayDate());