From a3775babd3cd29b56fb042061a1ae2c9277b63ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Mon, 6 Feb 2023 10:33:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=80=83=E5=8B=A4=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../attend/service/impl/RemoteAttend4SalaryServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java b/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java index 03cd1979d..e8b65d616 100644 --- a/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java +++ b/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java @@ -104,8 +104,8 @@ public class RemoteAttend4SalaryServiceImpl extends Service implements RemoteAtt List> list = new ArrayList<>(); try { Map paramsMap = new HashMap(); -// paramsMap.put("pageIndex", 1); -// paramsMap.put("pageSize", 500); + paramsMap.put("pageIndex", 1); + paramsMap.put("pageSize", 500); paramsMap.put("typeselect", "6"); paramsMap.put("fromDate", SalaryDateUtil.getFormatLocalDate(attend4Salary.getBeginDate())); paramsMap.put("toDate", SalaryDateUtil.getFormatLocalDate(attend4Salary.getEndDate())); From 0fb9fb51a0affaa53e675ac9b73dcfb499b5751c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Mon, 6 Feb 2023 11:08:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B0=83=E8=96=AA?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java b/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java index 94c1dc2e4..a1b3f41c0 100644 --- a/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java @@ -245,7 +245,11 @@ public class SalaryArchiveItemWrapper extends Service implements SalaryArchiveIt if (CollectionUtils.isNotEmpty(listAll)) { listAll.removeIf(a -> a.getId().equals(m.getId())); } - Optional optional = listAll.stream().filter(f -> f.getSalaryArchiveId().equals(m.getSalaryArchiveId()) && f.getSalaryItemId().equals(m.getSalaryItemId())).findFirst(); + Optional optional = listAll.stream() + .filter(f -> f.getSalaryArchiveId().equals(m.getSalaryArchiveId())) + .filter(f ->f.getSalaryItemId().equals(m.getSalaryItemId())) + .filter(f->f.getEffectiveTime().before(m.getEffectiveTime())) + .findFirst(); m.setAdjustBefore(optional.isPresent() ? optional.get().getAdjustAfter() : ""); m.setAdjustReason(SalaryArchiveItemAdjustReasonEnum.getDefaultLabelByValue(m.getAdjustReason())); From 2ff5ff0dcedf4c8dbeacf4eb0596a5f8b7586f0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Mon, 6 Feb 2023 16:28:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=80=83=E5=8B=A4=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=92=8C=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AttendQuoteDataServiceImpl.java | 10 ++-------- .../service/impl/AttendQuoteFieldServiceImpl.java | 8 ++++---- .../engine/salary/wrapper/AttendQuoteDataWrapper.java | 11 ++++------- 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java index 266400147..47034c64c 100644 --- a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java +++ b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java @@ -244,11 +244,8 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa header.add(SalaryI18nUtil.getI18nLabel(86317, "工号")); // 动态列 if (CollectionUtils.isNotEmpty(listMaps)) { - Map mapColumn = listMaps.get(0); for (AttendQuoteFieldPO attendQuoteField : attendQuoteFields) { - if (mapColumn.containsKey(attendQuoteField.getId() + "_attendQuoteData")) { - header.add(attendQuoteField.getFieldName()); - } + header.add(attendQuoteField.getFieldName()); } } @@ -264,11 +261,8 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa row.add(dto.get("jobNum")); // 动态列 - Map mapColumn = listMaps.get(0); for (AttendQuoteFieldPO attendQuoteField : attendQuoteFields) { - if (mapColumn.containsKey(attendQuoteField.getId() + "_attendQuoteData")) { - row.add(dto.get(attendQuoteField.getId().toString() + "_attendQuoteData")); - } + row.add(dto.get(attendQuoteField.getId().toString() + "_attendQuoteData")); } rows.add(row); } diff --git a/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java index f8d4b8eba..b576564ca 100644 --- a/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java +++ b/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java @@ -275,10 +275,10 @@ public class AttendQuoteFieldServiceImpl extends Service implements AttendQuoteF getAttendQuoteFieldMapper().updateNameByCode(updates); } // 2.删除 - if (CollectionUtils.isNotEmpty(deleteCodes)) { - //根据考勤字段编码删除考勤模块字段 - biz.deleteAttendByCode(AttendQuoteFieldQueryParam.builder().codes(deleteCodes).sourceType(AttendQuoteFieldSourceTypeEnum.ATTEND.getValue()).build()); - } +// if (CollectionUtils.isNotEmpty(deleteCodes)) { +// //根据考勤字段编码删除考勤模块字段 +// biz.deleteAttendByCode(AttendQuoteFieldQueryParam.builder().codes(deleteCodes).sourceType(AttendQuoteFieldSourceTypeEnum.ATTEND.getValue()).build()); +// } // 3.新增 List saves = new ArrayList<>(); for (String code : saveCodes) { diff --git a/src/com/engine/salary/wrapper/AttendQuoteDataWrapper.java b/src/com/engine/salary/wrapper/AttendQuoteDataWrapper.java index f9a394da6..ec042926c 100644 --- a/src/com/engine/salary/wrapper/AttendQuoteDataWrapper.java +++ b/src/com/engine/salary/wrapper/AttendQuoteDataWrapper.java @@ -32,11 +32,11 @@ import java.util.*; public class AttendQuoteDataWrapper extends Service { private AttendQuoteDataService getAttendQuoteDataService(User user) { - return ServiceUtil.getService(AttendQuoteDataServiceImpl.class, user); + return ServiceUtil.getService(AttendQuoteDataServiceImpl.class, user); } private AttendQuoteFieldService getAttendQuoteFieldService(User user) { - return ServiceUtil.getService(AttendQuoteFieldServiceImpl.class, user); + return ServiceUtil.getService(AttendQuoteFieldServiceImpl.class, user); } /** @@ -82,11 +82,8 @@ public class AttendQuoteDataWrapper extends Service { columns.add(new WeaTableColumn("150", SalaryI18nUtil.getI18nLabel(86317, "工号"), "jobNum")); // 动态列 if (CollectionUtils.isNotEmpty(listMaps)) { - Map map = listMaps.stream().max(Comparator.comparingInt(m -> m.keySet().size())).get(); for (AttendQuoteFieldPO attendQuoteField : attendQuoteFields) { - if (map.containsKey(attendQuoteField.getId() + "_attendQuoteData")) { - columns.add(new WeaTableColumn("150", attendQuoteField.getFieldName(), attendQuoteField.getId() + "_attendQuoteData")); - } + columns.add(new WeaTableColumn("150", attendQuoteField.getFieldName(), attendQuoteField.getId() + "_attendQuoteData")); } } @@ -153,7 +150,7 @@ public class AttendQuoteDataWrapper extends Service { /** * 获取数据 */ - public Map getData(AttendQuoteDataEditParam attendQuoteDataEditParam) { + public Map getData(AttendQuoteDataEditParam attendQuoteDataEditParam) { return getAttendQuoteDataService(user).getData(attendQuoteDataEditParam); } }