|
@@ -121,9 +121,11 @@ public class ParkRoomReservationService implements BaseService<ParkRoomReservati
|
|
|
.filter(x -> x.getString("roomName").contains(dto.getRoomName()))
|
|
|
.collect(Collectors.toList());
|
|
|
}
|
|
|
- // 分页
|
|
|
+ // 排序、分页
|
|
|
listSum = resultList.size();
|
|
|
resultList = resultList.stream()
|
|
|
+ .sorted(Comparator.comparingInt((JSONObject x) -> extractNumber(x.getString("buildingName")))
|
|
|
+ .thenComparingInt((JSONObject x) -> extractNumber(x.getString("roomName"))))
|
|
|
.skip((long) (tablepar.getPageNum() - 1) * tablepar.getPageSize()) // 跳过前面的数据项
|
|
|
.limit(tablepar.getPageSize()) // 取出指定数量的数据
|
|
|
.collect(Collectors.toList());
|
|
@@ -322,4 +324,13 @@ public class ParkRoomReservationService implements BaseService<ParkRoomReservati
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ private static int extractNumber(String s) {
|
|
|
+ try {
|
|
|
+ String numStr = s.replaceAll("[^0-9]", "");
|
|
|
+ return numStr.isEmpty() ? 0 : Integer.parseInt(numStr);
|
|
|
+ } catch (NumberFormatException e) {
|
|
|
+ return 0; // 或者根据需求处理异常
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
}
|