Commit 61c3d939 authored by hongguangwu's avatar hongguangwu

MVP1.7.1 预入职更新在项时的薪资人员

parent 19cdee60
...@@ -428,6 +428,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -428,6 +428,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
TEmpBadRecord info = tEmpBadRecordService.getByEmpId(empId); TEmpBadRecord info = tEmpBadRecordService.getByEmpId(empId);
if (info != null) { if (info != null) {
BeanUtil.copyProperties(info, tPreEmpBadRecord, ID); BeanUtil.copyProperties(info, tPreEmpBadRecord, ID);
if (Common.isEmpty(preId)) {
tPreEmpBadRecord.setId(info.getId());
}
tPreEmpBadRecord.setEmpId(empId); tPreEmpBadRecord.setEmpId(empId);
tPreEmpBadRecord.setOldId(info.getId()); tPreEmpBadRecord.setOldId(info.getId());
} }
...@@ -458,6 +461,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -458,6 +461,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
TEmpContactInfo info = tEmpContactInfoService.getByEmpId(empId); TEmpContactInfo info = tEmpContactInfoService.getByEmpId(empId);
if (info != null) { if (info != null) {
BeanUtil.copyProperties(info, tPreEmpContactInfo, ID); BeanUtil.copyProperties(info, tPreEmpContactInfo, ID);
if (Common.isEmpty(preId)) {
tPreEmpContactInfo.setId(info.getId());
}
tPreEmpContactInfo.setEmpId(empId); tPreEmpContactInfo.setEmpId(empId);
tPreEmpContactInfo.setOldId(info.getId()); tPreEmpContactInfo.setOldId(info.getId());
} }
...@@ -484,6 +490,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -484,6 +490,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
TEmpDisabilityInfo info = tEmpDisabilityInfoService.getByEmpId(empId); TEmpDisabilityInfo info = tEmpDisabilityInfoService.getByEmpId(empId);
if (info != null) { if (info != null) {
BeanUtil.copyProperties(info, tPreEmpDisabilityInfo, ID); BeanUtil.copyProperties(info, tPreEmpDisabilityInfo, ID);
if (Common.isEmpty(preId)) {
tPreEmpDisabilityInfo.setId(info.getId());
}
tPreEmpDisabilityInfo.setEmpId(empId); tPreEmpDisabilityInfo.setEmpId(empId);
tPreEmpDisabilityInfo.setOldId(info.getId()); tPreEmpDisabilityInfo.setOldId(info.getId());
} }
...@@ -517,6 +526,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -517,6 +526,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
TEmpEducation info = tEmpEducationService.getByEmpId(empId); TEmpEducation info = tEmpEducationService.getByEmpId(empId);
if (info != null) { if (info != null) {
BeanUtil.copyProperties(info, tPreEmpEducation, ID); BeanUtil.copyProperties(info, tPreEmpEducation, ID);
if (Common.isEmpty(preId)) {
tPreEmpEducation.setId(info.getId());
}
tPreEmpEducation.setEmpId(empId); tPreEmpEducation.setEmpId(empId);
tPreEmpEducation.setOldId(info.getId()); tPreEmpEducation.setOldId(info.getId());
...@@ -614,7 +626,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -614,7 +626,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
TPreEmpFamily record; TPreEmpFamily record;
for (TEmpFamily info : infoList) { for (TEmpFamily info : infoList) {
record = new TPreEmpFamily(); record = new TPreEmpFamily();
BeanUtil.copyProperties(info, record, ID); BeanUtil.copyProperties(info, record);
record.setEmpId(empId); record.setEmpId(empId);
record.setOldId(info.getId()); record.setOldId(info.getId());
record.setSettleDomain(deptId); record.setSettleDomain(deptId);
...@@ -777,7 +789,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -777,7 +789,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if (infoList != null && !infoList.isEmpty()) { if (infoList != null && !infoList.isEmpty()) {
for (TEmpProfessionalQualification info : infoList) { for (TEmpProfessionalQualification info : infoList) {
record = new TPreEmpProfessionalQualification(); record = new TPreEmpProfessionalQualification();
BeanUtil.copyProperties(info, record, ID); BeanUtil.copyProperties(info, record);
record.setEmpId(empId); record.setEmpId(empId);
record.setOldId(info.getId()); record.setOldId(info.getId());
record.setSettleDomain(deptId); record.setSettleDomain(deptId);
...@@ -892,7 +904,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -892,7 +904,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if (infoList != null && !infoList.isEmpty()) { if (infoList != null && !infoList.isEmpty()) {
for (TEmpOtherFile info : infoList) { for (TEmpOtherFile info : infoList) {
record = new TPreEmpOtherFile(); record = new TPreEmpOtherFile();
BeanUtil.copyProperties(info, record, ID); BeanUtil.copyProperties(info, record);
record.setEmpId(empId); record.setEmpId(empId);
record.setOldId(info.getId()); record.setOldId(info.getId());
// 附件 // 附件
...@@ -993,7 +1005,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -993,7 +1005,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if (infoList != null && !infoList.isEmpty()) { if (infoList != null && !infoList.isEmpty()) {
for (TEmpWorkRecording info : infoList) { for (TEmpWorkRecording info : infoList) {
record = new TPreEmpWorkRecording(); record = new TPreEmpWorkRecording();
BeanUtil.copyProperties(info, record, ID); BeanUtil.copyProperties(info, record);
record.setEmpId(empId); record.setEmpId(empId);
record.setOldId(info.getId()); record.setOldId(info.getId());
record.setSettleDomain(deptId); record.setSettleDomain(deptId);
......
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