Commit 1fc8a510 authored by hongguangwu's avatar hongguangwu

MVP1.7.9-离职日期按字典

parent 7f5b6db7
......@@ -782,12 +782,13 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
// 商险是否存在判断 type 1 单个接收 2 批量接收
private TEmployeeInsuranceExitCheckVo checkInsuranceExit(TEmployeeInsurancePreVo preVo) {
//查询入职确认信息数据
TEmployeeInsuranceExitCheckVo exitCheckVo = new TEmployeeInsuranceExitCheckVo();
boolean erorFlag = false;
R<TEmployeeInsuranceSelectVo> dataR = insuranceDaprUtil.selectInsurancePreInfoList(preVo);
//查询商险数据
TInsuranceDetail insuranceDetail= null;
R<TEmployeeInsuranceSelectVo> dataInsurR = insuranceDaprUtil.selectInsuranceInfo(preVo);
if (Common.isNotNull(dataInsurR) && Common.isNotNull(dataInsurR.getData().getInsuranceDetail())) {
if (Common.isNotNull(dataInsurR) && Common.isNotNull(dataInsurR.getData())&& Common.isNotNull(dataInsurR.getData().getInsuranceDetail())) {
insuranceDetail = dataInsurR.getData().getInsuranceDetail();
}
//二次确认接收场景
......@@ -836,12 +837,13 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
} else if (insuranceDetail.getBuyHandleStatus() == CommonConstants.FOUR_INT) {
preVo.setProcessStatus(CommonConstants.FIVE_STRING);
}
//是否地市自购
preVo.setIsAddress(insuranceDetail.getIsAdress());
}
}
}
//组装错误信息
if (erorFlag) {
TEmployeeInsuranceExitCheckVo exitCheckVo = new TEmployeeInsuranceExitCheckVo();
exitCheckVo.setBuyType(preVo.getBuyType());
exitCheckVo.setEmployeeName(preVo.getEmployeeName());
exitCheckVo.setEmpIdcard(preVo.getEmpIdcard());
......@@ -851,10 +853,10 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
exitCheckVo.setInsuranceCompanyName(preVo.getInsuranceCompanyName());
exitCheckVo.setInsuranceTypeName(preVo.getInsuranceTypeName());
exitCheckVo.setErrorMsg("存在流程中/已完结的商险数据");
return exitCheckVo;
} else {
return null;
}
return exitCheckVo;
}
@Override
......
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