diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java index 86a0634c16..bc89172504 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java @@ -488,8 +488,8 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl list = Arrays.asList(r.getTimeId().split(",")); list.forEach(l -> timeList.stream().filter( t -> l.equals(t.getTimeId())).forEach(t -> time.add(t.getTime()))); r.setAppointmentTime(time); - String endTime = time.get(time.size() - NumConstant.ONE).substring(6, 11); - if (LocalDateTime.now().isBefore(LocalDateTime.parse(r.getAppointmentDate() + " " + endTime))){ + String endTime = time.get(time.size() - NumConstant.ONE).substring(7, 11); + if (LocalDateTime.now().isBefore(LocalDateTime.parse(r.getAppointmentDate() + "T" + endTime))){ r.setIsCancel(false); } }); @@ -550,8 +550,8 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl list = Arrays.asList(r.getTimeId().split(",")); list.forEach(l -> timeList.stream().filter( t -> l.equals(t.getTimeId())).forEach(t -> time.add(t.getTime()))); r.setAppointmentTime(time); - String endTime = time.get(time.size() - NumConstant.ONE).substring(6, 11); - if (LocalDateTime.now().isBefore(LocalDateTime.parse(r.getAppointmentDate() + " " + endTime))){ + String endTime = time.get(time.size() - NumConstant.ONE).substring(7, 11); + if (LocalDateTime.now().isBefore(LocalDateTime.parse(r.getAppointmentDate() + "T" + endTime))){ r.setIsCancel(false); } }