社保和档案执行标识
This commit is contained in:
parent
a29f8b3da9
commit
3b520fcf62
|
|
@ -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() {
|
||||||
|
|
|
||||||
|
|
@ -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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue