|
@@ -94,7 +94,8 @@ public class DataCountService {
|
|
roomIds = roomList.stream().map(Room::getRoomId).collect(Collectors.toList());
|
|
roomIds = roomList.stream().map(Room::getRoomId).collect(Collectors.toList());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ startTime = Dateutils.formatStartTime(startTime);
|
|
|
|
+ endTime = Dateutils.formatEndTime(endTime);
|
|
RoomVisitData roomVisitData = new RoomVisitData();
|
|
RoomVisitData roomVisitData = new RoomVisitData();
|
|
List<DataCount> dbVisitList = roomVisitLogService.getByGroupRoomId("t_room_visit_log",roomIds,startTime,endTime);
|
|
List<DataCount> dbVisitList = roomVisitLogService.getByGroupRoomId("t_room_visit_log",roomIds,startTime,endTime);
|
|
List<DataCount> dbVisitListFmt = getDataCountListByList(dbVisitList, startTime, endTime);
|
|
List<DataCount> dbVisitListFmt = getDataCountListByList(dbVisitList, startTime, endTime);
|