Commit bb07037a authored by hongguangwu's avatar hongguangwu

MVP1.6.6-预入职相关_同步后的状态

parent db6a016f
......@@ -1352,7 +1352,14 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
isNew = true;
project = new TEmployeeProject();
}
BeanUtil.copyProperties(tPreEmployeeProject, project, ID);
String[] ignoreProperties = new String[]{"id","status"};
BeanUtil.copyProperties(tPreEmployeeProject, project, ignoreProperties);
if (Common.isEmpty(project.getStatus())) {
project.setStatus(CommonConstants.ZERO_INT);
}
if (Common.isEmpty(project.getEmpId()) && emp != null) {
project.setEmpId(emp.getId());
}
if (isNew) {
// 新项目档案塞基本属性
this.setNewEmpProjectBaseData(project, emp, dept, user);
......
......@@ -123,7 +123,7 @@
SELECT
<include refid="Base_Column_List"/>
FROM t_pre_emp_bad_record a
where PRE_MAIN_ID = #{preMainId}
where PRE_MAIN_ID = #{preMainId} order by a.create_time desc
limit 1
</select>
</mapper>
......@@ -97,7 +97,7 @@
SELECT
<include refid="Base_Column_List"/>
FROM t_pre_emp_contact_info a
where PRE_MAIN_ID = #{preMainId}
where PRE_MAIN_ID = #{preMainId} order by a.create_time desc
limit 1
</select>
</mapper>
......@@ -148,7 +148,7 @@
SELECT
<include refid="Base_Column_List"/>
FROM t_pre_emp_disability_info a
where PRE_MAIN_ID = #{preMainId}
where PRE_MAIN_ID = #{preMainId} order by a.create_time desc
limit 1
</select>
</mapper>
......@@ -163,7 +163,7 @@
SELECT
<include refid="Base_Column_List"/>
FROM t_pre_emp_education a
where PRE_MAIN_ID = #{preMainId}
where PRE_MAIN_ID = #{preMainId} order by a.create_time desc
limit 1
</select>
</mapper>
......@@ -297,7 +297,7 @@
SELECT
<include refid="Base_Column_List"/>
FROM t_pre_employee_info a
where PRE_MAIN_ID = #{preMainId}
where PRE_MAIN_ID = #{preMainId} order by a.create_time desc
limit 1
</select>
</mapper>
......@@ -288,7 +288,7 @@
SELECT
<include refid="Base_Column_List"/>
FROM t_pre_employee_project a
where PRE_MAIN_ID = #{preMainId}
where PRE_MAIN_ID = #{preMainId} order by a.create_time desc
limit 1
</select>
</mapper>
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