Commit 127f30d3 authored by hongguangwu's avatar hongguangwu

1.7.19-离职相关

parent 5bda7de4
...@@ -903,8 +903,6 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -903,8 +903,6 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
&& CommonConstants.ZERO_STRING.equals(contractInfo.getChangeContractAndEmployee())) { && CommonConstants.ZERO_STRING.equals(contractInfo.getChangeContractAndEmployee())) {
changeStatus(contractInfo, user); changeStatus(contractInfo, user);
} else { } else {
//先停用项目内的其他的员工合同————不要这个逻辑了
// 2022-7-22 16:54:12 产品倩倩与测试说,作废终止审核通过,仅将原先选择的合同不在用即可
//baseMapper.updateInUseStatusById(contractInfo.getEmpId(), contractInfo.getSettleDomain(), contractInfo.getId(), CommonConstants.ONE_STRING) //baseMapper.updateInUseStatusById(contractInfo.getEmpId(), contractInfo.getSettleDomain(), contractInfo.getId(), CommonConstants.ONE_STRING)
if (Common.isNotNull(contractInfo.getOldContractId())) { if (Common.isNotNull(contractInfo.getOldContractId())) {
TEmployeeContractInfo old = this.getById(contractInfo.getOldContractId()); TEmployeeContractInfo old = this.getById(contractInfo.getOldContractId());
...@@ -921,6 +919,9 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -921,6 +919,9 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
} else { } else {
return R.failed("未找到关联的原合同"); return R.failed("未找到关联的原合同");
} }
// 2026-01-29 倩倩:将其他更新为不在用、审核不通过
//该项目下其他在用的合同统一更新成不在用
doOtherContract(contractInfo, user);
// 作废、终止审核通过: // 作废、终止审核通过:
// 更新项目合同状态为(2不在用),档案状态要判断 // 更新项目合同状态为(2不在用),档案状态要判断
TEmployeeProject tEmployeeProject = tEmployeeProjectService.getOne(Wrappers.<TEmployeeProject>query() TEmployeeProject tEmployeeProject = tEmployeeProjectService.getOne(Wrappers.<TEmployeeProject>query()
...@@ -2438,12 +2439,12 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -2438,12 +2439,12 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
if (Common.isNotNull(contractInfoList)) { if (Common.isNotNull(contractInfoList)) {
for (TEmployeeContractInfo contractInfo1 : contractInfoList) { for (TEmployeeContractInfo contractInfo1 : contractInfoList) {
contractInfo1.setInUse(CommonConstants.ONE_STRING); contractInfo1.setInUse(CommonConstants.ONE_STRING);
contractInfo1.setAuditStatus(CommonConstants.TWO_INT); contractInfo1.setAuditStatus(CommonConstants.THREE_INT);
contractInfo1.setAuditUserName(user.getNickname()); contractInfo1.setAuditUserName(user.getNickname());
baseMapper.updateById(contractInfo1); baseMapper.updateById(contractInfo1);
//增加审核记录 //增加审核记录
this.setAuditInfoNew(contractInfo1); this.setAuditInfoNew(contractInfo1);
this.sendLeave(contractInfo1.getId(), CommonConstants.EIGHT_STRING, CommonConstants.ONE_STRING, "终止合同联动", user); //this.sendLeave(contractInfo1.getId(), CommonConstants.EIGHT_STRING, CommonConstants.ONE_STRING, "终止合同联动", user);
} }
} }
} }
......
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