|
|
|
@@ -406,14 +406,18 @@ public class DmMeetingInnerApiController extends BaseApiController { |
|
|
|
}*/ |
|
|
|
|
|
|
|
//获得当前时间开始最近的整点,或者半点 |
|
|
|
LocalTime currentTime = LocalTime.now(); |
|
|
|
if (currentTime.getMinute() >= 30) { |
|
|
|
currentTime = currentTime.plusHours(1).withMinute(0).withSecond(0); |
|
|
|
} else { |
|
|
|
currentTime = currentTime.withMinute(30).withSecond(0); |
|
|
|
String currentStr = "08:00"; |
|
|
|
if (dateStr.compareTo(DateUtils.formatDate(new Date(), "yyyy-MM-dd")) == 0) { |
|
|
|
LocalTime currentTime = LocalTime.now(); |
|
|
|
if (currentTime.getMinute() >= 30) { |
|
|
|
currentTime = currentTime.plusHours(1).withMinute(0).withSecond(0); |
|
|
|
} else { |
|
|
|
currentTime = currentTime.withMinute(30).withSecond(0); |
|
|
|
} |
|
|
|
|
|
|
|
currentStr = currentTime.format(DateTimeFormatter.ofPattern("HH:mm")); |
|
|
|
} |
|
|
|
|
|
|
|
String currentStr = currentTime.format(DateTimeFormatter.ofPattern("HH:mm")); |
|
|
|
Map<Long, List<DmMeetingOrdersPo>> groupedByRoom = list.stream() |
|
|
|
.collect(Collectors.groupingBy(DmMeetingOrdersPo::getSpaceId)); |
|
|
|
|
|
|
|
|