Commit 6d60f219 authored by huyuchen's avatar huyuchen

huych-入职登记提交

parent fb4cb6ba
...@@ -1574,6 +1574,10 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1574,6 +1574,10 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
// 有信息,就跳转到待审核 // 有信息,就跳转到待审核
if (pre != null && Common.isNotNull(pre.getId()) && CommonConstants.ONE_STRING.equals(status)) { if (pre != null && Common.isNotNull(pre.getId()) && CommonConstants.ONE_STRING.equals(status)) {
main.setStatus(CommonConstants.TWO_STRING); main.setStatus(CommonConstants.TWO_STRING);
if (Common.isEmpty(pre.getProcessStatus()) || CommonConstants.ONE_STRING.equals(pre.getProcessStatus())) {
pre.setProcessStatus(CommonConstants.TWO_STRING);
registrationPreService.updateById(pre);
}
if (isSimpleBoo) { if (isSimpleBoo) {
main.setStatus(CommonConstants.FOUR_STRING); main.setStatus(CommonConstants.FOUR_STRING);
// 审核日志 // 审核日志
...@@ -1587,10 +1591,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1587,10 +1591,6 @@ 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());
......
...@@ -692,8 +692,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -692,8 +692,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
@Override @Override
public R batchUpdatePreById(List<EmployeeRegistrationReceiveVo> employeeRegistList) { public R batchUpdatePreById(List<EmployeeRegistrationReceiveVo> employeeRegistList) {
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
EmployeeRegistration registrationNow;
for (EmployeeRegistrationReceiveVo vo : employeeRegistList) { for (EmployeeRegistrationReceiveVo vo : employeeRegistList) {
EmployeeRegistration registrationNow = baseMapper.selectById(vo.getId()); registrationNow = baseMapper.selectById(vo.getId());
if (Common.isEmpty(registrationNow) || !CommonConstants.ONE_STRING.equals(registrationNow.getProcessStatus())) { if (Common.isEmpty(registrationNow) || !CommonConstants.ONE_STRING.equals(registrationNow.getProcessStatus())) {
return R.failed(RegistConstants.NO_DATA_TO_HANDLE); return R.failed(RegistConstants.NO_DATA_TO_HANDLE);
} }
......
...@@ -4808,11 +4808,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -4808,11 +4808,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
// 派减部分办理失败 // 派减部分办理失败
socialInfo.setHandleStatus(CommonConstants.SEVEN_STRING); socialInfo.setHandleStatus(CommonConstants.SEVEN_STRING);
if ((Common.isEmpty(sf.getPensionHandle()) || CommonConstants.TWO_STRING.equals(sf.getPensionHandle()) || CommonConstants.THREE_STRING.equals(sf.getPensionHandle())) if ((Common.isEmpty(sf.getPensionHandle()) || CommonConstants.TWO_STRING.equals(sf.getPensionHandle()) || CommonConstants.THREE_STRING.equals(sf.getPensionHandle()))
|| (Common.isEmpty(sf.getMedicalHandle()) || CommonConstants.TWO_STRING.equals(sf.getMedicalHandle()) || CommonConstants.THREE_STRING.equals(sf.getMedicalHandle())) && (Common.isEmpty(sf.getMedicalHandle()) || CommonConstants.TWO_STRING.equals(sf.getMedicalHandle()) || CommonConstants.THREE_STRING.equals(sf.getMedicalHandle()))
|| (Common.isEmpty(sf.getUnemployHandle()) || CommonConstants.TWO_STRING.equals(sf.getUnemployHandle()) || CommonConstants.THREE_STRING.equals(sf.getUnemployHandle())) && (Common.isEmpty(sf.getUnemployHandle()) || CommonConstants.TWO_STRING.equals(sf.getUnemployHandle()) || CommonConstants.THREE_STRING.equals(sf.getUnemployHandle()))
|| (Common.isEmpty(sf.getWorkInjuryHandle()) || CommonConstants.TWO_STRING.equals(sf.getWorkInjuryHandle()) || CommonConstants.THREE_STRING.equals(sf.getBirthHandle())) && (Common.isEmpty(sf.getWorkInjuryHandle()) || CommonConstants.TWO_STRING.equals(sf.getWorkInjuryHandle()) || CommonConstants.THREE_STRING.equals(sf.getBirthHandle()))
|| (Common.isEmpty(sf.getBirthHandle()) || CommonConstants.TWO_STRING.equals(sf.getBirthHandle()) || CommonConstants.THREE_STRING.equals(sf.getBirthHandle())) && (Common.isEmpty(sf.getBirthHandle()) || CommonConstants.TWO_STRING.equals(sf.getBirthHandle()) || CommonConstants.THREE_STRING.equals(sf.getBirthHandle()))
|| (Common.isEmpty(sf.getBigailmentHandle()) || CommonConstants.TWO_STRING.equals(sf.getBigailmentHandle()) || CommonConstants.THREE_STRING.equals(sf.getBigailmentHandle()))) { && (Common.isEmpty(sf.getBigailmentHandle()) || CommonConstants.TWO_STRING.equals(sf.getBigailmentHandle()) || CommonConstants.THREE_STRING.equals(sf.getBigailmentHandle()))) {
sf.setSocialStatus(CommonConstants.EIGHT_STRING); sf.setSocialStatus(CommonConstants.EIGHT_STRING);
sf.setSocialReduceStatus(CommonConstants.TWO_STRING); sf.setSocialReduceStatus(CommonConstants.TWO_STRING);
} else { } else {
......
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