From 8ca7a266ae02064bc10349a21aa97e5dfa134e57 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Tue, 15 Jul 2025 15:11:46 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E7=89=B9=E5=88=86=E6=AE=B5=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salaryacct/bo/CalculateFormulaVarBO.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/com/engine/salary/entity/salaryacct/bo/CalculateFormulaVarBO.java b/src/com/engine/salary/entity/salaryacct/bo/CalculateFormulaVarBO.java index 694c901e7..17810a758 100644 --- a/src/com/engine/salary/entity/salaryacct/bo/CalculateFormulaVarBO.java +++ b/src/com/engine/salary/entity/salaryacct/bo/CalculateFormulaVarBO.java @@ -348,20 +348,20 @@ public class CalculateFormulaVarBO { SalarySobAdjustRulePO salaryAdjustmentRulePO = salarySobAdjustRulePOMap.get(entry.getKey()); List valueList = entry.getValue(); - if (CollectionUtils.isNotEmpty(valueList)) { - String firstDateStr = SalaryDateUtil.getFormatLocalDate(valueList.get(0).getEffectiveDateRange().getFromDate()); - String salaryCycleFirstStr = SalaryDateUtil.getFormatLocalDate(salaryCycle.getFromDate()); - if (isSeasonSob) { - salaryCycleFirstStr = SalaryDateUtil.getFormatLocalDate(salaryAcctCalculateBO.getSalarySobCycleDTO().getAttendCycleFromDate()); - } - if (!firstDateStr.equals(salaryCycleFirstStr)) { - LocalDateRange dateRange = LocalDateRange.builder() - .fromDate(isSeasonSob ? salaryAcctCalculateBO.getSalarySobCycleDTO().getAttendCycleFromDate() : salaryCycle.getFromDate()) - .endDate(valueList.get(0).getEffectiveDateRange().getFromDate()).build(); - SalaryArchiveItemDataDTO zeroDTO = SalaryArchiveItemDataDTO.builder().effectiveDateRange(dateRange).salaryItemId(valueList.get(0).getSalaryItemId()).value("0").build(); - valueList.add(0, zeroDTO); - } - } + // if (CollectionUtils.isNotEmpty(valueList)) { + // String firstDateStr = SalaryDateUtil.getFormatLocalDate(valueList.get(0).getEffectiveDateRange().getFromDate()); + // String salaryCycleFirstStr = SalaryDateUtil.getFormatLocalDate(salaryCycle.getFromDate()); + // if (isSeasonSob) { + // salaryCycleFirstStr = SalaryDateUtil.getFormatLocalDate(salaryAcctCalculateBO.getSalarySobCycleDTO().getAttendCycleFromDate()); + // } + // if (!firstDateStr.equals(salaryCycleFirstStr)) { + // LocalDateRange dateRange = LocalDateRange.builder() + // .fromDate(isSeasonSob ? salaryAcctCalculateBO.getSalarySobCycleDTO().getAttendCycleFromDate() : salaryCycle.getFromDate()) + // .endDate(valueList.get(0).getEffectiveDateRange().getFromDate()).build(); + // SalaryArchiveItemDataDTO zeroDTO = SalaryArchiveItemDataDTO.builder().effectiveDateRange(dateRange).salaryItemId(valueList.get(0).getSalaryItemId()).value("0").build(); + // valueList.add(0, zeroDTO); + // } + // } if (entry.getValue().size() > 2) { // 如果薪资项目在薪资周期内经历了多次调薪，则默认分段计薪 value = calculateBySalarySobAdjustRule(salaryCycle, SalarySobAdjustRuleTypeEnum.PARTITION, entry.getValue(), kqGroupService, employeeId, isSeasonSob);