Commit 2e896a8e authored by hongguangwu's avatar hongguangwu

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

parents bb07037a 78355e52
...@@ -749,6 +749,26 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -749,6 +749,26 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
tEmployeeInfo.setContractStatus(CommonConstants.ONE_INT); tEmployeeInfo.setContractStatus(CommonConstants.ONE_INT);
tEmployeeInfoMapper.updateById(tEmployeeInfo); tEmployeeInfoMapper.updateById(tEmployeeInfo);
} }
//签订类型正常签订的时候更新预入职列表
if (EmployeeConstants.SITUATION_ONE.equals(contractInfo.getSituation())) {
//根据项目编码和身份证号查询预入职列表
TPreEmpMain empMain = preEmpMainMapper.selectOne(Wrappers.<TPreEmpMain>query()
.lambda().eq(TPreEmpMain::getEmpIdcard, contractInfo.getEmpIdcard())
.eq(TPreEmpMain::getDeptNo, contractInfo.getDeptNo()));
if (Optional.ofNullable(empMain).isPresent()) {
//查询预入职项目档案表
TPreEmployeeProject preEmployeeProject = preEmployeeProjectMapper.selectOne(Wrappers.<TPreEmployeeProject>query()
.lambda().eq(TPreEmployeeProject::getPreMainId, empMain.getId()));
if (Optional.ofNullable(preEmployeeProject).isPresent()) {
preEmployeeProject.setContractType(contractInfo.getContractType());
preEmployeeProject.setWorkingHours(contractInfo.getWorkingHours());
preEmployeeProject.setPost(contractInfo.getPost());
preEmployeeProject.setEnjoinDate(contractInfo.getContractStart());
preEmployeeProject.setTryPeriod(contractInfo.getTryPeriod());
preEmployeeProjectMapper.updateById(preEmployeeProject);
}
}
}
} else { } else {
//是否同步终止合同、减项、减档为是的时候 单独写逻辑 //是否同步终止合同、减项、减档为是的时候 单独写逻辑
if (EmployeeConstants.SITUATION_SEVEN.equals(contractInfo.getSituation()) if (EmployeeConstants.SITUATION_SEVEN.equals(contractInfo.getSituation())
...@@ -1631,7 +1651,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -1631,7 +1651,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
preEmployeeProject.setContractType(contract.getContractType()); preEmployeeProject.setContractType(contract.getContractType());
preEmployeeProject.setWorkingHours(contract.getWorkingHours()); preEmployeeProject.setWorkingHours(contract.getWorkingHours());
preEmployeeProject.setPost(contract.getPost()); preEmployeeProject.setPost(contract.getPost());
preEmployeeProject.setEnjoinDate(DateUtil.stringToDate(contract.getCreateTimeStart(),DateUtil.ISO_EXPANDED_DATE_FORMAT)); preEmployeeProject.setEnjoinDate(contract.getContractStart());
preEmployeeProject.setTryPeriod(contract.getTryPeriod()); preEmployeeProject.setTryPeriod(contract.getTryPeriod());
preEmployeeProjectMapper.updateById(preEmployeeProject); preEmployeeProjectMapper.updateById(preEmployeeProject);
} }
......
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