diff --git a/app/Http/Controllers/Admin/OccupancyRateController.php b/app/Http/Controllers/Admin/OccupancyRateController.php index 7ed2221..61cc6ed 100644 --- a/app/Http/Controllers/Admin/OccupancyRateController.php +++ b/app/Http/Controllers/Admin/OccupancyRateController.php @@ -90,7 +90,7 @@ class OccupancyRateController extends BaseController public function chart(Request $request): JsonResponse { try { - $query = $this->service->queryList($request->all()); + $query = $this->service->queryList($request->all(), 'chart'); $list = $query->groupBy(['time', 'time_type'])->select( ['time', 'time_type'] )->get(); diff --git a/app/Services/ParkingOccupancyRateService.php b/app/Services/ParkingOccupancyRateService.php index e6d4386..5161bd4 100644 --- a/app/Services/ParkingOccupancyRateService.php +++ b/app/Services/ParkingOccupancyRateService.php @@ -47,7 +47,7 @@ class ParkingOccupancyRateService extends BaseService ParkingOccupancyRateInfo::query()->create($dataInfo); } - public function queryList($param) + public function queryList($param, $type_str = 'list') { $query = ParkingOccupancyRate::query(); @@ -92,7 +92,8 @@ class ParkingOccupancyRateService extends BaseService } } - $query->orderBy('time', 'desc'); + $direction = $type_str == 'list' ? 'DESC' : 'ASC'; + $query->orderBy('time', $direction); return $query; }