Browse Source

停车场占用率图标排序优化

master
wanghongjun 5 hours ago
parent
commit
e29aecf368
  1. 2
      app/Http/Controllers/Admin/OccupancyRateController.php
  2. 5
      app/Services/ParkingOccupancyRateService.php

2
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();

5
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;
}

Loading…
Cancel
Save