Commit 15e3fb82 authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.7.8' into MVP1.7.8

parents 29b5b403 09e3c1e8
...@@ -1890,6 +1890,11 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1890,6 +1890,11 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
} }
// 预入职-人员档案表 // 预入职-人员档案表
TPreEmployeeInfo tPreEmployeeInfo = vo.getTpreEmployeeInfo(); TPreEmployeeInfo tPreEmployeeInfo = vo.getTpreEmployeeInfo();
// 简档,初始化开关,后期如果优化简档详情页面,这里可不初始化
if (tPreEmployeeInfo != null && isSimpleBoo) {
tPreEmployeeInfo.setFirstWorkFlag(CommonConstants.ZERO_STRING);
tPreEmployeeInfo.setHaveQualification(CommonConstants.ONE_STRING);
}
// 预入职-项目档案表 // 预入职-项目档案表
TPreEmployeeProject tPreEmployeeProject = vo.getTpreEmployeeProject(); TPreEmployeeProject tPreEmployeeProject = vo.getTpreEmployeeProject();
// 预入职-员工学历信息表 // 预入职-员工学历信息表
...@@ -1971,6 +1976,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1971,6 +1976,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
emp.setFileProvince(tPreEmployeeInfo.getFileProvince()); emp.setFileProvince(tPreEmployeeInfo.getFileProvince());
emp.setFileCity(tPreEmployeeInfo.getFileCity()); emp.setFileCity(tPreEmployeeInfo.getFileCity());
emp.setFileTown(tPreEmployeeInfo.getFileTown()); emp.setFileTown(tPreEmployeeInfo.getFileTown());
emp.setFirstWorkFlag(tPreEmployeeInfo.getFirstWorkFlag());
emp.setHaveQualification(tPreEmployeeInfo.getHaveQualification());
} else { } else {
BeanUtil.copyProperties(tPreEmployeeInfo, emp, ID); BeanUtil.copyProperties(tPreEmployeeInfo, emp, ID);
......
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