From f762fd70303ec310397e7ad20d3f7b77bc33dae6 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Thu, 17 Nov 2022 16:51:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=96=AA=E7=BC=96=E8=BE=91=E3=80=81?= =?UTF-8?q?=E5=88=A0=E9=99=A4=20=E6=94=BE=E5=BC=80=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SalaryArchiveItemServiceImpl.java | 36 +++++++++---------- .../wrapper/SalaryArchiveItemWrapper.java | 15 ++++---- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java index 957399161..c1de23cf2 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java @@ -238,14 +238,14 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi // 获取生效+未生效的数据 List salaryItemsBySalaryArchiveIdAndItemIds = getSalaryItemsBySalaryArchiveIdAndItemIds(salaryArchiveItemSaveParam.getSalaryArchiveId(), salaryItemIds); // 获取当前已生效数据 - List effectiveSalaryItems = getEffectiveSalaryItems(salaryArchiveItemSaveParam.getSalaryArchiveId(), salaryItemIds); +// List effectiveSalaryItems = getEffectiveSalaryItems(salaryArchiveItemSaveParam.getSalaryArchiveId(), salaryItemIds); // 待保存生效时间 Date saveEffectiveTime = salaryArchiveItemSaveParam.getEffectiveTime(); salaryArchiveItems.forEach(e -> { // 已生效 - List effectiveList = effectiveSalaryItems.stream().filter(i -> i.getSalaryItemId().equals(e.getSalaryItemId())).collect(Collectors.toList()); +// List effectiveList = effectiveSalaryItems.stream().filter(i -> i.getSalaryItemId().equals(e.getSalaryItemId())).collect(Collectors.toList()); // 当前已生效 - SalaryArchiveItemPO effectiveSalaryItem = CollectionUtils.isNotEmpty(effectiveList) && effectiveList.size() > 0 ? effectiveList.get(0) : null; +// SalaryArchiveItemPO effectiveSalaryItem = CollectionUtils.isNotEmpty(effectiveList) && effectiveList.size() > 0 ? effectiveList.get(0) : null; List list = salaryItemsBySalaryArchiveIdAndItemIds.stream().filter(i -> i.getSalaryItemId().equals(e.getSalaryItemId())).collect(Collectors.toList()); boolean isNotNumber = StringUtils.isNotEmpty(e.getAdjustValue()) && !Pattern.matches(SalaryArchiveConstant.NUMBER_REGEX, e.getAdjustValue()); if (isNotNumber) { @@ -261,19 +261,19 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi } // 1.检验是否可以调整 - if (effectiveSalaryItem != null) { +// if (effectiveSalaryItem != null) { // 当前已经生效的时间 - Date effectiveTime = effectiveSalaryItem.getEffectiveTime(); +// Date effectiveTime = effectiveSalaryItem.getEffectiveTime(); // 1.1 如果保存的生效日期早于<当前已生效 - if (saveEffectiveTime.before(effectiveTime)) { - if(salaryArchiveItemSaveParam.getCanOperator() == Boolean.TRUE){ - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100429, "生效日期不可早于当前已生效的调整日期,仅修改备注")); - } - // 仅可编辑说明 - salaryArchiveItemMapper.updateIgnoreNull( SalaryArchiveItemPO.builder().id(salaryArchiveItemSaveParam.getSalaryArchiveItemId()) - .description(salaryArchiveItemSaveParam.getDescription()).build()); - } - } +// if (saveEffectiveTime.before(effectiveTime)) { +// if(salaryArchiveItemSaveParam.getCanOperator() == Boolean.TRUE){ +// throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100429, "生效日期不可早于当前已生效的调整日期")); +// } +// // 仅可编辑说明 +// salaryArchiveItemMapper.updateIgnoreNull( SalaryArchiveItemPO.builder().id(salaryArchiveItemSaveParam.getSalaryArchiveItemId()) +// .description(salaryArchiveItemSaveParam.getDescription()).build()); +// } +// } }); return SalaryArchiveItemPO.builder().id(salaryArchiveItemSaveParam.getSalaryArchiveItemId()).effectiveTime(salaryArchiveItemSaveParam.getEffectiveTime()).adjustReason(salaryArchiveItemSaveParam.getAdjustReason()) .description(salaryArchiveItemSaveParam.getDescription()).itemValue(salaryArchiveItemSaveParam.getSalaryArchiveItems().get(0).getAdjustValue()).build(); @@ -530,13 +530,13 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi if (salaryArchiveItem == null) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98299, "参数错误，薪资项目不存在或已被删除")); } - if (salaryArchiveItem.getEffectiveTime().after(new Date())) { +// if (salaryArchiveItem.getEffectiveTime().after(new Date())) { salaryArchiveItem.setDeleteType(1); // 删除未生效数据 salaryArchiveItemMapper.updateById(salaryArchiveItem); - } else { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98299, "该薪资项目已生效不可删除")); - } +// } else { +// throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98299, "该薪资项目已生效不可删除")); +// } return StringUtils.EMPTY; } diff --git a/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java b/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java index 1a946e816..94c1dc2e4 100644 --- a/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java @@ -343,13 +343,14 @@ public class SalaryArchiveItemWrapper extends Service implements SalaryArchiveIt for (int i = 0; i < resultList.size(); i++) { SingleSalaryItemAdjustRecordListDTO singleSalaryItemAdjustRecord = resultList.get(i); if(singleSalaryItemAdjustRecord.getId().equals(queryParam.getId())){ - Optional optional = effectiveSalaryItems.stream().filter(f -> f.getSalaryItemId().equals(singleSalaryItemAdjustRecord.getSalaryItemId())).findFirst(); - Date effectiveDate = optional.map(SalaryArchiveItemPO::getEffectiveTime).orElse(null); - if (effectiveDate != null && singleSalaryItemAdjustRecord.getEffectiveTime().before(effectiveDate)) { - singleSalaryItemAdjustRecord.setCanOperator(Boolean.FALSE); - } else { - singleSalaryItemAdjustRecord.setCanOperator(Boolean.TRUE); - } +// Optional optional = effectiveSalaryItems.stream().filter(f -> f.getSalaryItemId().equals(singleSalaryItemAdjustRecord.getSalaryItemId())).findFirst(); +// Date effectiveDate = optional.map(SalaryArchiveItemPO::getEffectiveTime).orElse(null); +// if (effectiveDate != null && singleSalaryItemAdjustRecord.getEffectiveTime().before(effectiveDate)) { +// singleSalaryItemAdjustRecord.setCanOperator(Boolean.FALSE); +// } else { +// singleSalaryItemAdjustRecord.setCanOperator(Boolean.TRUE); +// } + singleSalaryItemAdjustRecord.setCanOperator(Boolean.TRUE); Map map = new HashMap<>(3); map.put("salaryItem", String.valueOf(singleSalaryItemAdjustRecord.getSalaryItemId())); map.put("salaryBefore", singleSalaryItemAdjustRecord.getAdjustBefore());