Commit 14da156a authored by hongguangwu's avatar hongguangwu

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

parents 44c070f5 487c9683
...@@ -952,7 +952,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -952,7 +952,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
} }
} }
//确认接收时增加 档案、商险、合同、社保、公积金的变更日志 (具体产生哪些日志按服务事项(serverItem)来生成),参考 tEmployeePreLogService.saveModifyAndUpdateInsurance的实现,只处理日志 //确认接收时增加 档案、商险、合同、社保、公积金的变更日志 (具体产生哪些日志按服务事项(serverItem)来生成),参考 tEmployeePreLogService.saveModifyAndUpdateInsurance的实现,只处理日志
saveConfirmReceiveLog(domainR.getData(), preVo, user); saveConfirmReceiveLog(domainR.getData(), preVo, user,preVo.getEmployeeContractPreVos());
} catch (Exception e) { } catch (Exception e) {
log.error("自动化办理执行异常", e); log.error("自动化办理执行异常", e);
} }
...@@ -1666,7 +1666,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1666,7 +1666,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
} }
TEmployeeContractPreVo employeeContractPreVo = new TEmployeeContractPreVo(); TEmployeeContractPreVo employeeContractPreVo = new TEmployeeContractPreVo();
if (preVo.getServerItem().contains("合同") && Common.isNotNull(preVo.getEmployeeContractPreVos())) { if (preVo.getServerItem().contains("合同") && Common.isNotNull(preVo.getEmployeeContractPreVos())) {
preVo.setContractIsBuy(employeeContractPreVo.getContractFlag()); preVo.setContractIsBuy(preVo.getEmployeeContractPreVos().getContractFlag());
BeanUtils.copyProperties(preVo.getEmployeeContractPreVos(),employeeContractPreVo); BeanUtils.copyProperties(preVo.getEmployeeContractPreVos(),employeeContractPreVo);
//生成合同待购买数据 //生成合同待购买数据
String errorStr = null; String errorStr = null;
...@@ -1743,7 +1743,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1743,7 +1743,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
socialDaprUtils.saveFundPreInfo(preVo); socialDaprUtils.saveFundPreInfo(preVo);
} }
//确认接收时增加 档案、商险、合同、社保、公积金的变更日志 (具体产生哪些日志按服务事项(serverItem)来生成),参考 tEmployeePreLogService.saveModifyAndUpdateInsurance的实现,只处理日志 //确认接收时增加 档案、商险、合同、社保、公积金的变更日志 (具体产生哪些日志按服务事项(serverItem)来生成),参考 tEmployeePreLogService.saveModifyAndUpdateInsurance的实现,只处理日志
saveConfirmReceiveLog(domainR.getData(), preVo, user); saveConfirmReceiveLog(domainR.getData(), preVo, user,employeeContractPreVo);
} }
}catch (Exception e) { }catch (Exception e) {
log.error("执行异常", e); log.error("执行异常", e);
...@@ -2008,7 +2008,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -2008,7 +2008,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
} }
//保存确认接收日志(合同、商险、社保、公积金新增日志) //保存确认接收日志(合同、商险、社保、公积金新增日志)
if (Common.isNotNull(domainR) && Common.isNotNull(domainR.getData())) { if (Common.isNotNull(domainR) && Common.isNotNull(domainR.getData())) {
saveConfirmReceiveLog(domainR.getData(), preVo, user); saveConfirmReceiveLog(domainR.getData(), preVo, user,employeeContractPreVo);
} }
} }
}catch (Exception e) { }catch (Exception e) {
...@@ -3247,7 +3247,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -3247,7 +3247,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
* @param preVo 入职确认信息VO * @param preVo 入职确认信息VO
* @param user 当前用户 * @param user 当前用户
**/ **/
private void saveConfirmReceiveLog(String empPreId, EmployeeRegistrationPreVo preVo, YifuUser user) { private void saveConfirmReceiveLog(String empPreId, EmployeeRegistrationPreVo preVo, YifuUser user,TEmployeeContractPreVo employeeContractPreVo) {
try { try {
if (Common.isEmpty(empPreId) || Common.isEmpty(preVo)) { if (Common.isEmpty(empPreId) || Common.isEmpty(preVo)) {
return; return;
...@@ -3352,7 +3352,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -3352,7 +3352,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
contractDetail.setPreId(empPreId); contractDetail.setPreId(empPreId);
contractDetail.setPreLogId(logId); contractDetail.setPreLogId(logId);
contractDetail.setOldInfo(null); contractDetail.setOldInfo(null);
contractDetail.setNewInfo(JSON.toJSONString(preVo.getEmployeeContractPreVos(),JSON_FEATURES)); contractDetail.setNewInfo(JSON.toJSONString(employeeContractPreVo,JSON_FEATURES));
contractDetail.setDifferenceInfo(null); contractDetail.setDifferenceInfo(null);
contractDetail.setCreateBy(user.getId()); contractDetail.setCreateBy(user.getId());
contractDetail.setCreateName(user.getNickname()); contractDetail.setCreateName(user.getNickname());
......
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