qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01

This commit is contained in:
钱涛 2025-03-19 10:09:28 +08:00
parent 4913398650 c8f281613b
commit 7de1062387
4 changed files with 56 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/engine/salary/report/entity/param/SalaryStatisticsEmployeeSalaryQueryParam.java
View File

@ -25,6 +25,9 @@ public class SalaryStatisticsEmployeeSalaryQueryParam extends BaseQueryParam {
// 关键字 // 关键字
private String keyword; private String keyword;
//人员ids
private List<Long> employeeIds;
// 起始年月 // 起始年月
private String startDateStr; private String startDateStr;
private Date startDate; private Date startDate;

7
src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
View File

@ -321,6 +321,13 @@ public class SalaryStatisticsEmployeeServiceImpl extends Service implements Sala
List<Long> employeeIds = employeeList.stream().map(DataCollectionEmployee::getEmployeeId).collect(Collectors.toList()); List<Long> employeeIds = employeeList.stream().map(DataCollectionEmployee::getEmployeeId).collect(Collectors.toList());
salaryAcctEmployeeList = salaryAcctEmployeeList.stream().filter(acctEmp -> employeeIds.contains(acctEmp.getEmployeeId())).collect(Collectors.toList()); salaryAcctEmployeeList = salaryAcctEmployeeList.stream().filter(acctEmp -> employeeIds.contains(acctEmp.getEmployeeId())).collect(Collectors.toList());
} }
//人员浏览按钮筛选
List<Long> employeeIds = queryParam.getEmployeeIds();
if(CollectionUtils.isNotEmpty(employeeIds)){
salaryAcctEmployeeList = salaryAcctEmployeeList.stream().filter(acctEmp -> employeeIds.contains(acctEmp.getEmployeeId())).collect(Collectors.toList());
}
if (CollectionUtils.isEmpty(salaryAcctEmployeeList)) { if (CollectionUtils.isEmpty(salaryAcctEmployeeList)) {
return new PageInfo<>(); return new PageInfo<>();
} }

11
src/com/engine/salary/timer/AutoSyncEmpArchiveStartDateJob.java
View File

@ -42,6 +42,11 @@ import java.util.stream.Collectors;
@Slf4j @Slf4j
public class AutoSyncEmpArchiveStartDateJob extends BaseCronJob { public class AutoSyncEmpArchiveStartDateJob extends BaseCronJob {
private String syncInsuranceArchive;
private String syncSalaryArchive;
private String allStayAddToPay;
private String allGotoFixed;
private SalaryArchiveService getSalaryArchiveService(User user) { private SalaryArchiveService getSalaryArchiveService(User user) {
return ServiceUtil.getService(SalaryArchiveServiceImpl.class, user); return ServiceUtil.getService(SalaryArchiveServiceImpl.class, user);
} }
@ -55,12 +60,6 @@ public class AutoSyncEmpArchiveStartDateJob extends BaseCronJob {
return ServiceUtil.getService(SIArchivesServiceImpl.class, user); return ServiceUtil.getService(SIArchivesServiceImpl.class, user);
} }
private String syncInsuranceArchive;
private String syncSalaryArchive;
private String allStayAddToPay;
private String allGotoFixed;
private SalaryArchiveBiz getSalaryArchiveMapper = new SalaryArchiveBiz(); private SalaryArchiveBiz getSalaryArchiveMapper = new SalaryArchiveBiz();
private SocialSchemeMapper getSocialSchemeMapper() { private SocialSchemeMapper getSocialSchemeMapper() {

71
src/com/engine/salary/timer/AutoSyncResignationEmpArchiveJob.java
View File

@ -31,6 +31,13 @@ import java.util.*;
*/ */
public class AutoSyncResignationEmpArchiveJob extends BaseCronJob { public class AutoSyncResignationEmpArchiveJob extends BaseCronJob {
private String syncInsuranceArchive;
private String syncSalaryArchive;
private String allStayAddToPay;
private String allGotoFixed;
private SalaryArchiveService getSalaryArchiveService(User user) { private SalaryArchiveService getSalaryArchiveService(User user) {
return ServiceUtil.getService(SalaryArchiveServiceImpl.class,user); return ServiceUtil.getService(SalaryArchiveServiceImpl.class,user);
} }
@ -73,39 +80,43 @@ public class AutoSyncResignationEmpArchiveJob extends BaseCronJob {
} }
cal.add(Calendar.MONTH, preMonthValue); cal.add(Calendar.MONTH, preMonthValue);
Map<Long, String> resignationMap = getSalaryEmployeeService(user).getResignationMapByDate(SalaryDateUtil.getFormatDate(cal.getTime())); Map<Long, String> resignationMap = getSalaryEmployeeService(user).getResignationMapByDate(SalaryDateUtil.getFormatDate(cal.getTime()));
// 获取离职人员中没有设置最后发薪日期的薪资档案
List<SalaryArchivePO> salaryArchivePOS = getSalaryArchiveService(user).listPayEndDateIsNull(new ArrayList<>(resignationMap.keySet())); if (StringUtils.isBlank(syncSalaryArchive) || !StringUtils.equals(syncSalaryArchive, "false")) {
Date now = new Date(); // 获取离职人员中没有设置最后发薪日期的薪资档案
List<SalaryArchivePO> needUpdateSalaryArchiveList = new ArrayList<>(); List<SalaryArchivePO> salaryArchivePOS = getSalaryArchiveService(user).listPayEndDateIsNull(new ArrayList<>(resignationMap.keySet()));
for(SalaryArchivePO archive : salaryArchivePOS){ Date now = new Date();
String dismissDate = resignationMap.get(archive.getEmployeeId()); List<SalaryArchivePO> needUpdateSalaryArchiveList = new ArrayList<>();
if (StringUtils.isNotBlank(dismissDate)) { for(SalaryArchivePO archive : salaryArchivePOS){
archive.setPayEndDate(SalaryDateUtil.dateStrToLocalDate(dismissDate)); String dismissDate = resignationMap.get(archive.getEmployeeId());
archive.setUpdateTime(now); if (StringUtils.isNotBlank(dismissDate)) {
needUpdateSalaryArchiveList.add(archive); archive.setPayEndDate(SalaryDateUtil.dateStrToLocalDate(dismissDate));
archive.setUpdateTime(now);
needUpdateSalaryArchiveList.add(archive);
}
}
if (CollectionUtils.isNotEmpty(needUpdateSalaryArchiveList)) {
getSalaryArchiveMapper.batchUpdate(needUpdateSalaryArchiveList);
} }
} }
if (CollectionUtils.isNotEmpty(needUpdateSalaryArchiveList)) { if (StringUtils.isBlank(syncInsuranceArchive) || !StringUtils.equals(syncInsuranceArchive, "false")) {
getSalaryArchiveMapper.batchUpdate(needUpdateSalaryArchiveList); // 获取离职人员中没有设置最后缴纳月的社保福利档案
}
// 获取离职人员中没有设置最后缴纳月的社保福利档案
// List<InsuranceArchivesBaseInfoPO> needSyncList = siArchivesBiz.listEndDateIsNull(new ArrayList<>(resignationMap.keySet())); // List<InsuranceArchivesBaseInfoPO> needSyncList = siArchivesBiz.listEndDateIsNull(new ArrayList<>(resignationMap.keySet()));
List<InsuranceArchivesBaseInfoPO> needSyncList = getSIArchivesService(user).listEndDateIsNull(new ArrayList<>(resignationMap.keySet())); List<InsuranceArchivesBaseInfoPO> needSyncList = getSIArchivesService(user).listEndDateIsNull(new ArrayList<>(resignationMap.keySet()));
// 设置社保、公积金最后缴纳月 // 设置社保、公积金最后缴纳月
for(InsuranceArchivesBaseInfoPO po : needSyncList){ for(InsuranceArchivesBaseInfoPO po : needSyncList){
String dismissDate = resignationMap.get(po.getEmployeeId()); String dismissDate = resignationMap.get(po.getEmployeeId());
if (StringUtils.isNotEmpty(dismissDate)) { if (StringUtils.isNotEmpty(dismissDate)) {
dismissDate = StringUtils.substring(dismissDate,0,7); dismissDate = StringUtils.substring(dismissDate,0,7);
// 更新社保最后缴纳月 // 更新社保最后缴纳月
Long socialArchivesId = po.getSocialArchivesId(); Long socialArchivesId = po.getSocialArchivesId();
getSocialSchemeMapper().updateEndTime(socialArchivesId, dismissDate); getSocialSchemeMapper().updateEndTime(socialArchivesId, dismissDate);
// 更新公积金最后缴纳月 // 更新公积金最后缴纳月
Long fundArchivesId = po.getFundArchivesId(); Long fundArchivesId = po.getFundArchivesId();
getFundSchemeMapper().updateEndTime(fundArchivesId, dismissDate); getFundSchemeMapper().updateEndTime(fundArchivesId, dismissDate);
// 更新企业年金及其他福利最后缴纳月 // 更新企业年金及其他福利最后缴纳月
Long otherArchivesId = po.getOtherArchivesId(); Long otherArchivesId = po.getOtherArchivesId();
getOtherSchemeMapper().updateEndTime(otherArchivesId, dismissDate); getOtherSchemeMapper().updateEndTime(otherArchivesId, dismissDate);
}
} }
} }
} }