Merge remote-tracking branch 'origin/dev_ic_mp' into develop

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<IcPartyServ
             List<String> 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);
+            String endTime = time.get(time.size() - NumConstant.ONE).substring(7, 11);
-            if (LocalDateTime.now().isBefore(LocalDateTime.parse(r.getAppointmentDate() + " " + endTime))){
+            if (LocalDateTime.now().isBefore(LocalDateTime.parse(r.getAppointmentDate() + "T" + endTime))){
                 r.setIsCancel(false);
             }
         });
@@ -550,8 +550,8 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
                     List<String> 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);
+                    String endTime = time.get(time.size() - NumConstant.ONE).substring(7, 11);
-                    if (LocalDateTime.now().isBefore(LocalDateTime.parse(r.getAppointmentDate() + " " + endTime))){
+                    if (LocalDateTime.now().isBefore(LocalDateTime.parse(r.getAppointmentDate() + "T" + endTime))){
                         r.setIsCancel(false);
                     }
                 }