From 3b520fcf62d6805b2bc1daa1af60191e53b8360f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 18 Mar 2025 17:31:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=A4=BE=E4=BF=9D=E5=92=8C=E6=A1=A3?= =?UTF-8?q?=E6=A1=88=E6=89=A7=E8=A1=8C=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../timer/AutoSyncEmpArchiveStartDateJob.java | 11 ++- .../AutoSyncResignationEmpArchiveJob.java | 71 +++++++++++-------- 2 files changed, 46 insertions(+), 36 deletions(-) diff --git a/src/com/engine/salary/timer/AutoSyncEmpArchiveStartDateJob.java b/src/com/engine/salary/timer/AutoSyncEmpArchiveStartDateJob.java index 6c817ed4e..683d1ddd0 100644 --- a/src/com/engine/salary/timer/AutoSyncEmpArchiveStartDateJob.java +++ b/src/com/engine/salary/timer/AutoSyncEmpArchiveStartDateJob.java @@ -42,6 +42,11 @@ import java.util.stream.Collectors; @Slf4j public class AutoSyncEmpArchiveStartDateJob extends BaseCronJob { + private String syncInsuranceArchive; + private String syncSalaryArchive; + + private String allStayAddToPay; + private String allGotoFixed; private SalaryArchiveService getSalaryArchiveService(User user) { return ServiceUtil.getService(SalaryArchiveServiceImpl.class, user); } @@ -55,12 +60,6 @@ public class AutoSyncEmpArchiveStartDateJob extends BaseCronJob { return ServiceUtil.getService(SIArchivesServiceImpl.class, user); } - private String syncInsuranceArchive; - private String syncSalaryArchive; - - private String allStayAddToPay; - private String allGotoFixed; - private SalaryArchiveBiz getSalaryArchiveMapper = new SalaryArchiveBiz(); private SocialSchemeMapper getSocialSchemeMapper() { diff --git a/src/com/engine/salary/timer/AutoSyncResignationEmpArchiveJob.java b/src/com/engine/salary/timer/AutoSyncResignationEmpArchiveJob.java index d5bec89d0..0d9e978c3 100644 --- a/src/com/engine/salary/timer/AutoSyncResignationEmpArchiveJob.java +++ b/src/com/engine/salary/timer/AutoSyncResignationEmpArchiveJob.java @@ -31,6 +31,13 @@ import java.util.*; */ public class AutoSyncResignationEmpArchiveJob extends BaseCronJob { + private String syncInsuranceArchive; + private String syncSalaryArchive; + + private String allStayAddToPay; + private String allGotoFixed; + + private SalaryArchiveService getSalaryArchiveService(User user) { return ServiceUtil.getService(SalaryArchiveServiceImpl.class,user); } @@ -73,39 +80,43 @@ public class AutoSyncResignationEmpArchiveJob extends BaseCronJob { } cal.add(Calendar.MONTH, preMonthValue); Map resignationMap = getSalaryEmployeeService(user).getResignationMapByDate(SalaryDateUtil.getFormatDate(cal.getTime())); - // 获取离职人员中没有设置最后发薪日期的薪资档案 - List salaryArchivePOS = getSalaryArchiveService(user).listPayEndDateIsNull(new ArrayList<>(resignationMap.keySet())); - Date now = new Date(); - List needUpdateSalaryArchiveList = new ArrayList<>(); - for(SalaryArchivePO archive : salaryArchivePOS){ - String dismissDate = resignationMap.get(archive.getEmployeeId()); - if (StringUtils.isNotBlank(dismissDate)) { - archive.setPayEndDate(SalaryDateUtil.dateStrToLocalDate(dismissDate)); - archive.setUpdateTime(now); - needUpdateSalaryArchiveList.add(archive); + + if (StringUtils.isBlank(syncSalaryArchive) || !StringUtils.equals(syncSalaryArchive, "false")) { + // 获取离职人员中没有设置最后发薪日期的薪资档案 + List salaryArchivePOS = getSalaryArchiveService(user).listPayEndDateIsNull(new ArrayList<>(resignationMap.keySet())); + Date now = new Date(); + List needUpdateSalaryArchiveList = new ArrayList<>(); + for(SalaryArchivePO archive : salaryArchivePOS){ + String dismissDate = resignationMap.get(archive.getEmployeeId()); + if (StringUtils.isNotBlank(dismissDate)) { + archive.setPayEndDate(SalaryDateUtil.dateStrToLocalDate(dismissDate)); + archive.setUpdateTime(now); + needUpdateSalaryArchiveList.add(archive); + } + } + if (CollectionUtils.isNotEmpty(needUpdateSalaryArchiveList)) { + getSalaryArchiveMapper.batchUpdate(needUpdateSalaryArchiveList); } } - if (CollectionUtils.isNotEmpty(needUpdateSalaryArchiveList)) { - getSalaryArchiveMapper.batchUpdate(needUpdateSalaryArchiveList); - } - - // 获取离职人员中没有设置最后缴纳月的社保福利档案 + if (StringUtils.isBlank(syncInsuranceArchive) || !StringUtils.equals(syncInsuranceArchive, "false")) { + // 获取离职人员中没有设置最后缴纳月的社保福利档案 // List needSyncList = siArchivesBiz.listEndDateIsNull(new ArrayList<>(resignationMap.keySet())); - List needSyncList = getSIArchivesService(user).listEndDateIsNull(new ArrayList<>(resignationMap.keySet())); - // 设置社保、公积金最后缴纳月 - for(InsuranceArchivesBaseInfoPO po : needSyncList){ - String dismissDate = resignationMap.get(po.getEmployeeId()); - if (StringUtils.isNotEmpty(dismissDate)) { - dismissDate = StringUtils.substring(dismissDate,0,7); - // 更新社保最后缴纳月 - Long socialArchivesId = po.getSocialArchivesId(); - getSocialSchemeMapper().updateEndTime(socialArchivesId, dismissDate); - // 更新公积金最后缴纳月 - Long fundArchivesId = po.getFundArchivesId(); - getFundSchemeMapper().updateEndTime(fundArchivesId, dismissDate); - // 更新企业年金及其他福利最后缴纳月 - Long otherArchivesId = po.getOtherArchivesId(); - getOtherSchemeMapper().updateEndTime(otherArchivesId, dismissDate); + List needSyncList = getSIArchivesService(user).listEndDateIsNull(new ArrayList<>(resignationMap.keySet())); + // 设置社保、公积金最后缴纳月 + for(InsuranceArchivesBaseInfoPO po : needSyncList){ + String dismissDate = resignationMap.get(po.getEmployeeId()); + if (StringUtils.isNotEmpty(dismissDate)) { + dismissDate = StringUtils.substring(dismissDate,0,7); + // 更新社保最后缴纳月 + Long socialArchivesId = po.getSocialArchivesId(); + getSocialSchemeMapper().updateEndTime(socialArchivesId, dismissDate); + // 更新公积金最后缴纳月 + Long fundArchivesId = po.getFundArchivesId(); + getFundSchemeMapper().updateEndTime(fundArchivesId, dismissDate); + // 更新企业年金及其他福利最后缴纳月 + Long otherArchivesId = po.getOtherArchivesId(); + getOtherSchemeMapper().updateEndTime(otherArchivesId, dismissDate); + } } } } From c8f281613bec34fc4489324fc20865d014ab5cba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 18 Mar 2025 17:45:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=BA=E5=91=98=E6=B5=8F=E8=A7=88=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E5=A4=9A=E9=80=89=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../param/SalaryStatisticsEmployeeSalaryQueryParam.java | 3 +++ .../service/impl/SalaryStatisticsEmployeeServiceImpl.java | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/src/com/engine/salary/report/entity/param/SalaryStatisticsEmployeeSalaryQueryParam.java b/src/com/engine/salary/report/entity/param/SalaryStatisticsEmployeeSalaryQueryParam.java index a1dbab11b..a5d6b0253 100644 --- a/src/com/engine/salary/report/entity/param/SalaryStatisticsEmployeeSalaryQueryParam.java +++ b/src/com/engine/salary/report/entity/param/SalaryStatisticsEmployeeSalaryQueryParam.java @@ -25,6 +25,9 @@ public class SalaryStatisticsEmployeeSalaryQueryParam extends BaseQueryParam { // 关键字 private String keyword; + //人员ids + private List employeeIds; + // 起始年月 private String startDateStr; private Date startDate; diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java index 2e49c8353..2267440fc 100644 --- a/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java +++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java @@ -344,6 +344,13 @@ public class SalaryStatisticsEmployeeServiceImpl extends Service implements Sala List employeeIds = employeeList.stream().map(DataCollectionEmployee::getEmployeeId).collect(Collectors.toList()); salaryAcctEmployeeList = salaryAcctEmployeeList.stream().filter(acctEmp -> employeeIds.contains(acctEmp.getEmployeeId())).collect(Collectors.toList()); } + + //人员浏览按钮筛选 + List employeeIds = queryParam.getEmployeeIds(); + if(CollectionUtils.isNotEmpty(employeeIds)){ + salaryAcctEmployeeList = salaryAcctEmployeeList.stream().filter(acctEmp -> employeeIds.contains(acctEmp.getEmployeeId())).collect(Collectors.toList()); + } + if (CollectionUtils.isEmpty(salaryAcctEmployeeList)) { return new PageInfo<>(); }