|
@@ -230,6 +230,11 @@ public class IsvRegisterServiceImpl implements IsvRegisterService {
|
|
Date date = getCurrentDate();
|
|
Date date = getCurrentDate();
|
|
if (getScheduleListResponse.getCode() == ResultCode.SUCCEED_VALUE) {
|
|
if (getScheduleListResponse.getCode() == ResultCode.SUCCEED_VALUE) {
|
|
scheduleList = getScheduleListResponse.getSchedulesList();
|
|
scheduleList = getScheduleListResponse.getSchedulesList();
|
|
|
|
+ if(!Checker.isNone(serviceDate)){
|
|
|
|
+ Date dateS = DateUtil.parseDate(serviceDate, "yyyy-MM-dd");
|
|
|
|
+ scheduleList = scheduleList.stream()
|
|
|
|
+ .filter(s -> dateS.compareTo(DateUtil.parseDate(s.getServiceDate(), "yyyy-MM-dd")) == 0).collect(Collectors.toList());
|
|
|
|
+ }
|
|
scheduleList = scheduleList.stream()
|
|
scheduleList = scheduleList.stream()
|
|
.filter(p -> date.compareTo(DateUtil.parseDate(p.getServiceDate() + " " + p.getEndTime(), "yyyy-MM-dd HH:mm"))< 0).collect(Collectors.toList());
|
|
.filter(p -> date.compareTo(DateUtil.parseDate(p.getServiceDate() + " " + p.getEndTime(), "yyyy-MM-dd HH:mm"))< 0).collect(Collectors.toList());
|
|
} else {
|
|
} else {
|