Commit 35362e6c authored by hongguangwu's avatar hongguangwu

1.7.23-优化

parent 469988d8
...@@ -893,6 +893,15 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -893,6 +893,15 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
receiveVo.setEmpProjectId(exit.getEmpProjectId()); receiveVo.setEmpProjectId(exit.getEmpProjectId());
receiveVo.setProjectCreateTime(exit.getProjectTime()); receiveVo.setProjectCreateTime(exit.getProjectTime());
receiveVo.setPreVo(preVo); receiveVo.setPreVo(preVo);
if (Common.isNotNull(registration.getEmpIdcard()) && Common.isNotNull(registration.getDeptNo())) {
// 历史数据归档
archivesDaprUtil.archiveRegisterPreInfo(registration.getEmpIdcard(), registration.getDeptNo());
archivesDaprUtil.archiveContractPreInfo(registration.getEmpIdcard(), registration.getDeptNo());
insuranceDaprUtil.archiveInsurancePreInfo(registration.getEmpIdcard(), registration.getDeptNo());
socialDaprUtils.archiveSocialFundPreInfo(registration.getEmpIdcard(), registration.getDeptNo());
}
return R.ok(receiveVo); return R.ok(receiveVo);
} }
registration.setProcessStatus(CommonConstants.ZERO_STRING); registration.setProcessStatus(CommonConstants.ZERO_STRING);
...@@ -1724,6 +1733,14 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1724,6 +1733,14 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
receiveVo.setProjectCreateTime(exit.getProjectTime()); receiveVo.setProjectCreateTime(exit.getProjectTime());
receiveVo.setPreVo(preVo); receiveVo.setPreVo(preVo);
receiveVoList.add(receiveVo); receiveVoList.add(receiveVo);
if (Common.isNotNull(registration.getEmpIdcard()) && Common.isNotNull(registration.getDeptNo())) {
// 历史数据归档
archivesDaprUtil.archiveRegisterPreInfo(registration.getEmpIdcard(), registration.getDeptNo());
archivesDaprUtil.archiveContractPreInfo(registration.getEmpIdcard(), registration.getDeptNo());
insuranceDaprUtil.archiveInsurancePreInfo(registration.getEmpIdcard(), registration.getDeptNo());
socialDaprUtils.archiveSocialFundPreInfo(registration.getEmpIdcard(), registration.getDeptNo());
}
continue; continue;
} }
registration.setProcessStatus(CommonConstants.ZERO_STRING); registration.setProcessStatus(CommonConstants.ZERO_STRING);
......
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