From 29eb40106f59e2c371a5a265a8ad17f3246580ac Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 4 Jan 2022 10:56:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcPartyServiceCenterServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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..82941db80b 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,7 +488,7 @@ 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); + String endTime = time.get(time.size() - NumConstant.ONE).substring(7, 11); if (LocalDateTime.now().isBefore(LocalDateTime.parse(r.getAppointmentDate() + " " + endTime))){ r.setIsCancel(false); } @@ -550,7 +550,7 @@ 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); + String endTime = time.get(time.size() - NumConstant.ONE).substring(7, 11); if (LocalDateTime.now().isBefore(LocalDateTime.parse(r.getAppointmentDate() + " " + endTime))){ r.setIsCancel(false); } From 0d580d56255292ed1849fa8fd3c56f4bb60dec36 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 4 Jan 2022 11:02:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcPartyServiceCenterServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 82941db80b..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 @@ -489,7 +489,7 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl 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(7, 11); - if (LocalDateTime.now().isBefore(LocalDateTime.parse(r.getAppointmentDate() + " " + endTime))){ + if (LocalDateTime.now().isBefore(LocalDateTime.parse(r.getAppointmentDate() + "T" + endTime))){ r.setIsCancel(false); } }); @@ -551,7 +551,7 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl 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(7, 11); - if (LocalDateTime.now().isBefore(LocalDateTime.parse(r.getAppointmentDate() + " " + endTime))){ + if (LocalDateTime.now().isBefore(LocalDateTime.parse(r.getAppointmentDate() + "T" + endTime))){ r.setIsCancel(false); } }