Commit 9c6c4895 authored by huyuchen's avatar huyuchen

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

parents 37be53d2 9eddcc1a
...@@ -1589,6 +1589,10 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1589,6 +1589,10 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmpMainLogService.save(auditLog); tPreEmpMainLogService.save(auditLog);
updateToEmployeeByPre(vo, isSimpleBoo); updateToEmployeeByPre(vo, isSimpleBoo);
} }
if (Common.isEmpty(pre.getProcessStatus()) || CommonConstants.ONE_STRING.equals(pre.getProcessStatus())) {
pre.setProcessStatus(CommonConstants.TWO_STRING);
registrationPreService.updateById(pre);
}
} }
main.setStatus(status); main.setStatus(status);
main.setCreateBy(user.getId()); main.setCreateBy(user.getId());
......
...@@ -292,11 +292,7 @@ ...@@ -292,11 +292,7 @@
<!-- 获取员工类型与档案地市-优先从档案维护任务表 --> <!-- 获取员工类型与档案地市-优先从档案维护任务表 -->
<select id="getPreByPre" resultMap="employeeRegistrationPreMap"> <select id="getPreByPre" resultMap="employeeRegistrationPreMap">
select select
a.id, <include refid="Base_Column_List"/>
a.emp_nature,
a.file_province,
a.file_city,
a.file_town
from employee_registration_pre a where a.emp_idcard = #{empIdCard} and a.dept_id = #{deptId} from employee_registration_pre a where a.emp_idcard = #{empIdCard} and a.dept_id = #{deptId}
</select> </select>
<!-- 获取员工类型与档案地市-从项目档案表 --> <!-- 获取员工类型与档案地市-从项目档案表 -->
......
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