Commit b01c2dfc authored by huyuchen's avatar huyuchen

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

parent a3b1fdeb
...@@ -580,11 +580,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -580,11 +580,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
insurancePreVo.setProcessStatus(CommonConstants.ZERO_STRING); insurancePreVo.setProcessStatus(CommonConstants.ZERO_STRING);
} }
} }
//特殊场景如果针对新增,如果入职日期大于等于预计生效时间 那预计生效和保单开始时间就取入职日期 // //特殊场景如果针对新增,如果入职日期大于等于预计生效时间 那预计生效和保单开始时间就取入职日期
if (insurancePreVo.getBuyType() == 1 && DateUtil.dateToString(registration.getJoinLeaveDate()).compareTo(DateUtil.dateToString(insurancePreVo.getExpectedCollectionTime()))>0) { // if (insurancePreVo.getBuyType() == 1 && DateUtil.dateToString(registration.getJoinLeaveDate()).compareTo(DateUtil.dateToString(insurancePreVo.getExpectedCollectionTime()))>0) {
insurancePreVo.setPolicyStart(registration.getJoinLeaveDate()); // insurancePreVo.setPolicyStart(registration.getJoinLeaveDate());
insurancePreVo.setExpectedCollectionTime(registration.getJoinLeaveDate()); // insurancePreVo.setExpectedCollectionTime(registration.getJoinLeaveDate());
} // }
} }
if (!errorList.isEmpty()) { if (!errorList.isEmpty()) {
return R.other(CommonConstants.TWO_INT,null,errorList); return R.other(CommonConstants.TWO_INT,null,errorList);
...@@ -685,11 +685,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -685,11 +685,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
insurancePreVo.setPolicyEffect(registration.getJoinLeaveDate()); insurancePreVo.setPolicyEffect(registration.getJoinLeaveDate());
insurancePreVo.setPolicyStart(registration.getJoinLeaveDate()); insurancePreVo.setPolicyStart(registration.getJoinLeaveDate());
} }
//特殊场景如果针对新增,如果入职日期大于等于预计生效时间 那预计生效和保单开始时间就取入职日期 // //特殊场景如果针对新增,如果入职日期大于等于预计生效时间 那预计生效和保单开始时间就取入职日期
if (insurancePreVo.getBuyType() == 1 && DateUtil.dateToString(registration.getJoinLeaveDate()).compareTo(DateUtil.dateToString(insurancePreVo.getExpectedCollectionTime()))>0) { // if (insurancePreVo.getBuyType() == 1 && DateUtil.dateToString(registration.getJoinLeaveDate()).compareTo(DateUtil.dateToString(insurancePreVo.getExpectedCollectionTime()))>0) {
insurancePreVo.setPolicyStart(registration.getJoinLeaveDate()); // insurancePreVo.setPolicyStart(registration.getJoinLeaveDate());
insurancePreVo.setExpectedCollectionTime(registration.getJoinLeaveDate()); // insurancePreVo.setExpectedCollectionTime(registration.getJoinLeaveDate());
} // }
//入职日期需要小于保单截止日期 //入职日期需要小于保单截止日期
if ((DateUtil.dateToString(registration.getJoinLeaveDate(),DateUtil.ISO_EXPANDED_DATE_FORMAT). if ((DateUtil.dateToString(registration.getJoinLeaveDate(),DateUtil.ISO_EXPANDED_DATE_FORMAT).
compareTo(DateUtil.dateToString(insurancePreVo.getPolicyEnd(),DateUtil.ISO_EXPANDED_DATE_FORMAT)) > 0) compareTo(DateUtil.dateToString(insurancePreVo.getPolicyEnd(),DateUtil.ISO_EXPANDED_DATE_FORMAT)) > 0)
......
...@@ -329,7 +329,7 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo ...@@ -329,7 +329,7 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo
if (givenLocalDate.isBefore(today) || givenLocalDate.isEqual(today)) { if (givenLocalDate.isBefore(today) || givenLocalDate.isEqual(today)) {
// 如果日期前一个工作日日期小于等于今天 // 如果日期前一个工作日日期小于等于今天
if (currentTime.isBefore(LocalTime.of(15, 30)) || currentTime.equals(LocalTime.of(15, 30))) { if (currentTime.isBefore(LocalTime.of(15, 20)) || currentTime.equals(LocalTime.of(15, 20))) {
// 如果当前时间在15:20之前 // 如果当前时间在15:20之前
vo.setPriDisDate(LocalDateTimeUtils.convertLDToDate(today)); vo.setPriDisDate(LocalDateTimeUtils.convertLDToDate(today));
vo.setRegistDate(DateUtil.addDayByDate(vo.getPriDisDate(), CommonConstants.ONE_INT)); vo.setRegistDate(DateUtil.addDayByDate(vo.getPriDisDate(), CommonConstants.ONE_INT));
......
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