Commit 5e495a05 authored by hongguangwu's avatar hongguangwu

1.7.21-优化预入职

parent f871bd3c
...@@ -2494,6 +2494,14 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -2494,6 +2494,14 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
// 2025-3-27 15:13:30 张倩倩认为要同步项目的合同信息 // 2025-3-27 15:13:30 张倩倩认为要同步项目的合同信息
String[] ignoreProperties = new String[]{"id", "workingHours", "tryPeriod"}; String[] ignoreProperties = new String[]{"id", "workingHours", "tryPeriod"};
Integer oldDeptContractStatus = project.getContractStatus();
Integer oldDeptSocialStatus = project.getSocialStatus();
Integer oldDeptFundStatus = project.getFundStatus();
Integer oldDeptInsuranceStatus = project.getInsuranceStatus();
Integer oldDeptSocialProvince = project.getSocialProvince();
Integer oldDeptSocialCity = project.getSocialCity();
Integer oldDeptSocialTown = project.getSocialTown();
BeanUtil.copyProperties(tPreEmployeeProject, project, ignoreProperties); BeanUtil.copyProperties(tPreEmployeeProject, project, ignoreProperties);
if (Common.isEmpty(project.getStatus())) { if (Common.isEmpty(project.getStatus())) {
project.setStatus(CommonConstants.ZERO_INT); project.setStatus(CommonConstants.ZERO_INT);
...@@ -2505,6 +2513,24 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -2505,6 +2513,24 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
// 新项目档案塞基本属性 // 新项目档案塞基本属性
this.setNewEmpProjectBaseData(project, emp, dept, user); this.setNewEmpProjectBaseData(project, emp, dept, user);
} }
if (Common.isNotNull(oldDeptContractStatus) && oldDeptContractStatus != 0) {
project.setContractStatus(oldDeptContractStatus);
}
if (Common.isNotNull(oldDeptSocialStatus) && oldDeptSocialStatus != 0) {
project.setSocialStatus(oldDeptSocialStatus);
}
if (Common.isNotNull(oldDeptFundStatus) && oldDeptFundStatus != 0) {
project.setFundStatus(oldDeptFundStatus);
}
if (Common.isNotNull(oldDeptInsuranceStatus) && oldDeptInsuranceStatus != 0) {
project.setInsuranceStatus(oldDeptInsuranceStatus);
}
// 2026-03-24 段说要不更新社保省市县
if (Common.isNotNull(oldDeptSocialProvince)) {
project.setSocialProvince(oldDeptSocialProvince);
project.setSocialCity(oldDeptSocialCity);
project.setSocialTown(oldDeptSocialTown);
}
tEmployeeProjectService.saveOrUpdate(project); tEmployeeProjectService.saveOrUpdate(project);
} }
return project; return project;
...@@ -2530,6 +2556,11 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -2530,6 +2556,11 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
emp = new TEmployeeInfo(); emp = new TEmployeeInfo();
} }
String empCode = emp.getEmpCode(); String empCode = emp.getEmpCode();
// 检查人员档案的合同社保公积金状态,如果不是初始状态则不更新
Integer oldContractStatus = emp.getContractStatus();
Integer oldSocialStatus = emp.getSocialStatus();
Integer oldFundStatus = emp.getFundStatus();
Integer oldInsuranceStatus = emp.getInsuranceStatus();
BeanUtil.copyProperties(tPreEmployeeInfo, emp, ID); BeanUtil.copyProperties(tPreEmployeeInfo, emp, ID);
if (Common.isEmpty(emp.getEmpCode()) && Common.isNotNull(empCode)) { if (Common.isEmpty(emp.getEmpCode()) && Common.isNotNull(empCode)) {
emp.setEmpCode(empCode); emp.setEmpCode(empCode);
...@@ -2544,6 +2575,19 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -2544,6 +2575,19 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
this.setNewEmpBaseData(emp, user); this.setNewEmpBaseData(emp, user);
} }
emp.setFileStatus(CommonConstants.ZERO_INT); emp.setFileStatus(CommonConstants.ZERO_INT);
if (Common.isNotNull(oldContractStatus) && oldContractStatus != 0) {
emp.setContractStatus(oldContractStatus);
}
if (Common.isNotNull(oldSocialStatus) && oldSocialStatus != 0) {
emp.setSocialStatus(oldSocialStatus);
}
if (Common.isNotNull(oldFundStatus) && oldFundStatus != 0) {
emp.setFundStatus(oldFundStatus);
}
if (Common.isNotNull(oldInsuranceStatus) && oldInsuranceStatus != 0) {
emp.setInsuranceStatus(oldInsuranceStatus);
}
tEmployeeInfoService.saveOrUpdate(emp); tEmployeeInfoService.saveOrUpdate(emp);
return emp; return emp;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment