Commit b2235f01 authored by fangxinjiang's avatar fangxinjiang

Merge branch 'MVP1.7.21' into develop

parents 8b8ceb65 eb419745
......@@ -1396,6 +1396,12 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
exitCheckVo.setDeptName(registration.getDeptName());
exitCheckVo.setDeptNo(registration.getDeptNo());
if (preVo.getServerItem().contains("商险") && !preVo.getEmployeeInsurancePreVos().isEmpty()) {
if (CommonConstants.THREE_STRING.equals(registration.getProcessStatus())) {
exitCheckVo.setType(preVo.getServerItem());
exitCheckVo.setErrorMsg("已拒绝入职,不可操作!");
errorList.add(exitCheckVo);
continue;
}
//批量的商险是否已购买默认为否
if (Common.isEmpty(preVo.getInsuranceIsBuy())) {
preVo.setInsuranceIsBuy(CommonConstants.ONE_STRING);
......
......@@ -1045,12 +1045,14 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
}
// 已完成状态不需要更新
if (null != insurancePre && CommonConstants.SIX_STRING.equals(insurancePre.getProcessStatus())) {
if (null == insurancePre || CommonConstants.SIX_STRING.equals(insurancePre.getProcessStatus())) {
return false;
}
LambdaUpdateWrapper<TEmployeeInsurancePre> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(TEmployeeInsurancePre::getRegisterId, preVo.getRegisterId());
updateWrapper.ne(TEmployeeInsurancePre::getIsLeave, CommonConstants.ZERO_STRING);
updateWrapper.ne(TEmployeeInsurancePre::getIsRefuse, CommonConstants.ZERO_STRING);
updateWrapper.ne(TEmployeeInsurancePre::getProcessStatus, CommonConstants.SIX_STRING);
updateWrapper.set(TEmployeeInsurancePre::getIsRefuse, CommonConstants.ZERO_STRING);
return this.update(updateWrapper);
......
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