Commit 1d01cc45 authored by huyuchen's avatar huyuchen

huych-入职登记商险待办提交

parent 98197959
...@@ -680,18 +680,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -680,18 +680,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
insurancePreVo.setPolicyEffect(registration.getJoinLeaveDate()); insurancePreVo.setPolicyEffect(registration.getJoinLeaveDate());
insurancePreVo.setPolicyStart(registration.getJoinLeaveDate()); insurancePreVo.setPolicyStart(registration.getJoinLeaveDate());
} }
//商险是否存在判断 //入职日期需要小于保单截止日期
checkVo = checkInsuranceExit(insurancePreVo, registration.getEmployeeName(), registration.getEmpIdcard()); if ((DateUtil.dateToString(registration.getJoinLeaveDate(),DateUtil.ISO_EXPANDED_DATE_FORMAT).
if (null != checkVo) { compareTo(DateUtil.dateToString(insurancePreVo.getPolicyEnd(),DateUtil.ISO_EXPANDED_DATE_FORMAT)) >= 0)
errorList.add(checkVo); || (DateUtil.dateToString(insurancePreVo.getPolicyStart(),DateUtil.ISO_EXPANDED_DATE_FORMAT).
continue; compareTo(DateUtil.dateToString(insurancePreVo.getPolicyEnd(),DateUtil.ISO_EXPANDED_DATE_FORMAT)) > 0)) {
} else {
if (Common.isEmpty(insurancePreVo.getProcessStatus())) {
insurancePreVo.setProcessStatus(CommonConstants.ZERO_STRING);
}
}
//入职日期需要小于等于保单截止日期
if (registration.getJoinLeaveDate().after(insurancePreVo.getPolicyEnd())) {
TEmployeeInsuranceExitCheckVo exitCheckVo = new TEmployeeInsuranceExitCheckVo(); TEmployeeInsuranceExitCheckVo exitCheckVo = new TEmployeeInsuranceExitCheckVo();
exitCheckVo.setBuyType(insurancePreVo.getBuyType()); exitCheckVo.setBuyType(insurancePreVo.getBuyType());
exitCheckVo.setEmployeeName(registration.getEmployeeName()); exitCheckVo.setEmployeeName(registration.getEmployeeName());
...@@ -701,9 +694,19 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -701,9 +694,19 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
exitCheckVo.setBuyStandard(insurancePreVo.getBuyStandard()); exitCheckVo.setBuyStandard(insurancePreVo.getBuyStandard());
exitCheckVo.setInsuranceCompanyName(insurancePreVo.getInsuranceCompanyName()); exitCheckVo.setInsuranceCompanyName(insurancePreVo.getInsuranceCompanyName());
exitCheckVo.setInsuranceTypeName(insurancePreVo.getInsuranceTypeName()); exitCheckVo.setInsuranceTypeName(insurancePreVo.getInsuranceTypeName());
exitCheckVo.setErrorMsg("入职日期需要小于等于保单截止日期!"); exitCheckVo.setErrorMsg("入职日期需要小于保单截止日期/保单开始日期需小于等于保单截止日期");
errorList.add(exitCheckVo);
continue;
}
//商险是否存在判断
checkVo = checkInsuranceExit(insurancePreVo, registration.getEmployeeName(), registration.getEmpIdcard());
if (null != checkVo) {
errorList.add(checkVo); errorList.add(checkVo);
continue; continue;
} else {
if (Common.isEmpty(insurancePreVo.getProcessStatus())) {
insurancePreVo.setProcessStatus(CommonConstants.ZERO_STRING);
}
} }
} }
//点击“接收确认”的时候,监测到该人员该项目下已有在项的档案时,再次提醒:该人员已在项, //点击“接收确认”的时候,监测到该人员该项目下已有在项的档案时,再次提醒:该人员已在项,
......
...@@ -75,9 +75,9 @@ public class TEmployeeInsurancePreExportVo implements Serializable { ...@@ -75,9 +75,9 @@ public class TEmployeeInsurancePreExportVo implements Serializable {
/** /**
* 是否地市自购0是 1 否 * 是否地市自购0是 1 否
*/ */
@ExcelAttribute(name = "是否地市自购0是 1 否") @ExcelAttribute(name = "是否地市自购")
@Schema(description = "是否地市自购0是 1 否") @Schema(description = "是否地市自购")
@ExcelProperty("是否地市自购0是 1 否") @ExcelProperty("是否地市自购")
private String isAddress; private String isAddress;
/** /**
......
...@@ -348,8 +348,8 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur ...@@ -348,8 +348,8 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
} }
if (Common.isNotNull(preExit)) { if (Common.isNotNull(preExit)) {
pre.setId(preExit.getId()); pre.setId(preExit.getId());
baseMapper.insert(pre);
baseMapper.deleteById(preExit); baseMapper.deleteById(preExit);
baseMapper.insert(pre);
} else { } else {
baseMapper.insert(pre); baseMapper.insert(pre);
//暂时不需要,先注释,后续可能会需要 //暂时不需要,先注释,后续可能会需要
......
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