Commit 356edcf8 authored by hongguangwu's avatar hongguangwu

MVP1.6.6-预入职相关_先删

parent 2e896a8e
...@@ -468,6 +468,12 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -468,6 +468,12 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if (tPreEmployeeProject == null) { if (tPreEmployeeProject == null) {
tPreEmployeeProject = new TPreEmployeeProject(); tPreEmployeeProject = new TPreEmployeeProject();
tPreEmployeeProject.setEmpIdcard(main.getEmpIdcard()); tPreEmployeeProject.setEmpIdcard(main.getEmpIdcard());
tPreEmployeeProject.setUnitId(dept.getCustomerId());
tPreEmployeeProject.setUnitName(dept.getCustomerName());
tPreEmployeeProject.setUnitNo(dept.getCustomerNo());
tPreEmployeeProject.setBusinessPrimaryType(dept.getBusinessPrimaryType());
tPreEmployeeProject.setBusinessSecondType(dept.getBusinessSecondType());
tPreEmployeeProject.setBusinessThirdType(dept.getBusinessThirdType());
tPreEmployeeProject.setDeptId(main.getDeptId()); tPreEmployeeProject.setDeptId(main.getDeptId());
tPreEmployeeProject.setDeptName(main.getDeptName()); tPreEmployeeProject.setDeptName(main.getDeptName());
tPreEmployeeProject.setDeptNo(main.getDeptNo()); tPreEmployeeProject.setDeptNo(main.getDeptNo());
...@@ -1234,9 +1240,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1234,9 +1240,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
} }
// 预入职-员工职业资格信息表 // 预入职-员工职业资格信息表
List<TPreEmpProfessionalQualification> tPreEmpProfessionalQualificationList = vo.getTpreEmpProfessionalQualificationList(); List<TPreEmpProfessionalQualification> tPreEmpProfessionalQualificationList = vo.getTpreEmpProfessionalQualificationList();
// 先删除其他信息
tEmpProfessionalService.deleteProfessionalByEmpId(empId);
if (tPreEmpProfessionalQualificationList != null) { if (tPreEmpProfessionalQualificationList != null) {
// 先删除其他信息
tEmpProfessionalService.deleteProfessionalByEmpId(empId);
TEmpProfessionalQualification info; TEmpProfessionalQualification info;
for (TPreEmpProfessionalQualification preInfo : tPreEmpProfessionalQualificationList) { for (TPreEmpProfessionalQualification preInfo : tPreEmpProfessionalQualificationList) {
info = new TEmpProfessionalQualification(); info = new TEmpProfessionalQualification();
...@@ -1282,9 +1288,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1282,9 +1288,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
} }
// 预入职-员工工作履历信息表 // 预入职-员工工作履历信息表
List<TPreEmpWorkRecording> tPreEmpWorkRecordingList = vo.getTpreEmpWorkRecordingList(); List<TPreEmpWorkRecording> tPreEmpWorkRecordingList = vo.getTpreEmpWorkRecordingList();
// 先删除其他信息
tEmpWorkRecordingService.deleteWorkRecordByEmpId(empId);
if (tPreEmpWorkRecordingList != null) { if (tPreEmpWorkRecordingList != null) {
// 先删除其他信息
tEmpWorkRecordingService.deleteWorkRecordByEmpId(empId);
TEmpWorkRecording info; TEmpWorkRecording info;
for (TPreEmpWorkRecording preInfo : tPreEmpWorkRecordingList) { for (TPreEmpWorkRecording preInfo : tPreEmpWorkRecordingList) {
info = new TEmpWorkRecording(); info = new TEmpWorkRecording();
......
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