fix 返回排序

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/meeting/controller/api/DmMeetingInnerApiController.java

@@ -45,6 +45,7 @@ import java.text.SimpleDateFormat;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -337,7 +338,8 @@ public class DmMeetingInnerApiController extends BaseApiController {
             freeTimeList.add(json);
             return  freeTimeList;
         }
-
+//        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm");
+        objects = objects.stream().sorted(Comparator.comparing(po -> DateUtils.formatDate(po.getStartTime(), "HH:mm"))).collect(Collectors.toList());
         if (objects.size() > 1)
         for (int i = 0; i < objects.size() - 1; i++) {
             DmMeetingOrdersPo current = objects.get(i);
@@ -367,7 +369,7 @@ public class DmMeetingInnerApiController extends BaseApiController {
 
             if (i==objects.size() - 2) {
                 JSONObject json = new JSONObject();
-                json.put("startTime", freeEndTimeStr);
+                json.put("startTime", DateUtils.formatDate(next.getEndTime(), "HH:mm"));
                 json.put("endTime", 0);
                 json.put("roomId", current.getSpaceId());
                 freeTimeList.add(json);
@@ -400,7 +402,7 @@ public class DmMeetingInnerApiController extends BaseApiController {
 
 
         //过滤掉今天的已经过去的预约记录，并按开始时间进行排序
-        list = list.stream().filter(t->DateUtils.formatDate(t.getOrderDate(), "yyyy-MM-dd").compareTo(DateUtils.formatDate(new Date(), "yyyy-MM-dd"))>0 || (DateUtils.formatDate(t.getOrderDate(), "yyyy-MM-dd").compareTo(DateUtils.formatDate(new Date(), "yyyy-MM-dd"))==0 && DateUtils.formatDate(t.getStartTime(), "HH:mm").compareTo(DateUtils.formatDate(new Date(), "HH:mm"))>0)).sorted((o1, o2) -> o2.getStartTime().compareTo(o1.getStartTime())).collect(Collectors.toList());;
+        list = list.stream().filter(t->DateUtils.formatDate(t.getOrderDate(), "yyyy-MM-dd").compareTo(DateUtils.formatDate(new Date(), "yyyy-MM-dd"))>0 || (DateUtils.formatDate(t.getOrderDate(), "yyyy-MM-dd").compareTo(DateUtils.formatDate(new Date(), "yyyy-MM-dd"))==0 && DateUtils.formatDate(t.getStartTime(), "HH:mm").compareTo(DateUtils.formatDate(new Date(), "HH:mm"))>0)).sorted(Comparator.comparing(po -> DateUtils.formatDate(po.getStartTime(), "HH:mm"))).collect(Collectors.toList());
 
         /*List<String> times = new ArrayList<>();
         for  (int i = 0 ;i<list.size();i++){
@@ -438,7 +440,7 @@ public class DmMeetingInnerApiController extends BaseApiController {
             arr.addAll(freeTime.get(key));
         }
         Map<Long, String> finalRooms = rooms;
-        arr = arr.stream().map(j->{j.put("roomName", finalRooms.get(j.getLong("roomId")));return j;}).sorted((o1, o2) -> o2.getString("startTime").compareTo(o1.getString("startTime"))).collect(Collectors.toList());
+        arr = arr.stream().map(j->{j.put("roomName", finalRooms.get(j.getLong("roomId")));return j;}).sorted(Comparator.comparing(po -> po.getString("startTime"))).collect(Collectors.toList());
         return arr;
     }