Commit 74dc8072 authored by hongguangwu's avatar hongguangwu

MVP1.6.6-预入职相关_保存审核等

parent f2ee2f21
...@@ -991,7 +991,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -991,7 +991,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
// 如果档案项目id都没有,则新增。newFlag是true: // 如果档案项目id都没有,则新增。newFlag是true:
boolean newFlag = true; boolean newFlag = true;
String empId = null; String empId = null;
String empProjectId = null;
String empIdCard = null; String empIdCard = null;
// 1人员档案 // 1人员档案
TEmployeeInfo emp = null; TEmployeeInfo emp = null;
...@@ -1048,10 +1047,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1048,10 +1047,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
} }
tEmployeeProjectService.updateById(project); tEmployeeProjectService.updateById(project);
} else { } else {
project = this.saveTEmployeeProject(project, user, tPreEmployeeProject, emp, dept); this.saveTEmployeeProject(project, user, tPreEmployeeProject, emp, dept);
}
if (Common.isNotNull(project)) {
empProjectId = project.getId();
} }
} else { } else {
// 新建档案、项目档案,将档案id赋值,给其他附属信息 // 新建档案、项目档案,将档案id赋值,给其他附属信息
...@@ -1064,10 +1060,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1064,10 +1060,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
empId = emp.getId(); empId = emp.getId();
empIdCard = emp.getEmpIdcard(); empIdCard = emp.getEmpIdcard();
// 2项目档案 // 2项目档案
project = this.saveTEmployeeProject(project, user, tPreEmployeeProject, emp, dept); this.saveTEmployeeProject(project, user, tPreEmployeeProject, emp, dept);
if (Common.isNotNull(project)) {
empProjectId = project.getId();
}
} }
} }
if (emp == null) { if (emp == null) {
......
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