Commit b86731a9 authored by fangxinjiang's avatar fangxinjiang

项目划转

parent e8fe8c90
......@@ -480,7 +480,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
if (Common.isEmpty(oldEmpProject.getSocialStatus())
|| CommonConstants.ZERO_INT == oldEmpProject.getSocialStatus()){
resStr.append("社保项不存在,无法划转! <br>");
}
}else {
if (Common.isEmpty(newEmpProject.getSocialStatus())
|| CommonConstants.ZERO_INT == newEmpProject.getSocialStatus()){
newEmpProject.setSocialStatus(oldEmpProject.getSocialStatus());
......@@ -498,12 +498,13 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
resStr.append("目标项目档案存在社保数据,社保划转失败! <br>");
}
}
}
// 处理公积金 如果目标项目档案已存在公积金 不划转
if (vo.getChangeItems().indexOf(CommonConstants.TWO_STRING) >= CommonConstants.ZERO_INT) {
if (Common.isEmpty(oldEmpProject.getFundStatus())
|| CommonConstants.ZERO_INT == oldEmpProject.getFundStatus()){
resStr.append("公积金项不存在,无法划转! <br>");
}
}else{
if (Common.isEmpty(newEmpProject.getFundStatus())
|| CommonConstants.ZERO_INT == newEmpProject.getFundStatus()){
newEmpProject.setFundStatus(oldEmpProject.getFundStatus());
......@@ -515,12 +516,13 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
resStr.append("目标项目档案存在公积金数据,公积金划转失败! <br>");
}
}
}
// 处理員工合同 目标 已有合同状态 不在处理合同划转
if (vo.getChangeItems().indexOf(CommonConstants.ZERO_STRING) >= CommonConstants.ZERO_INT){
if (Common.isEmpty(oldEmpProject.getContractStatus())
|| CommonConstants.ZERO_INT == oldEmpProject.getContractStatus()){
resStr.append("员工合同不存在,无法划转! <br>");
}
}else {
if (Common.isEmpty(newEmpProject.getContractStatus())
|| CommonConstants.ZERO_INT == newEmpProject.getContractStatus()){
newEmpProject.setContractStatus(oldEmpProject.getContractStatus());
......@@ -533,6 +535,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
resStr.append("目标项目档案存在员工合同数据,员工合同划转失败! <br>");
}
}
}
// 变更老的项目档案
tEmployeeProjectService.updateChangeById(oldEmpProject);
//新增或变更新的项目档案
......
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