diff --git a/app/Exports/ParkingBehaviorExport.php b/app/Exports/ParkingBehaviorExport.php index 4c561d9..8e075ef 100644 --- a/app/Exports/ParkingBehaviorExport.php +++ b/app/Exports/ParkingBehaviorExport.php @@ -19,10 +19,11 @@ class ParkingBehaviorExport implements FromArray, WithHeadings . "COUNT(license_plate_id) AS parking_frequency, SUM(COALESCE(" . "leave_time, UNIX_TIMESTAMP()) - enter_time) AS parking_duration"; $from = " FROM `parking_access_record` "; + $order = ' ORDER BY time_period DESC'; $group = " GROUP BY DATE_FORMAT(FROM_UNIXTIME(enter_time)," . " '%Y-%m-%d'), `license_plate_id`"; - $items = DB::select($select . $from . $group); + $items = DB::select($select . $from . $order . $group); foreach ($items as &$item) { $license_plate = ParkingLicensePlate::getNumber( $item->license_plate_id diff --git a/app/Http/Controllers/Admin/ParkingBehaviorController.php b/app/Http/Controllers/Admin/ParkingBehaviorController.php index ca1016c..dbd1243 100644 --- a/app/Http/Controllers/Admin/ParkingBehaviorController.php +++ b/app/Http/Controllers/Admin/ParkingBehaviorController.php @@ -25,6 +25,7 @@ class ParkingBehaviorController extends BaseController . "COUNT(license_plate_id) AS parking_frequency, SUM(COALESCE(" . "leave_time, UNIX_TIMESTAMP()) - enter_time) AS parking_duration"; $from = " FROM `parking_access_record` "; + $order = ' ORDER BY time_period DESC'; $group = " GROUP BY DATE_FORMAT(FROM_UNIXTIME(enter_time)," . " '%Y-%m-%d'), `license_plate_id`"; @@ -95,7 +96,7 @@ class ParkingBehaviorController extends BaseController $limit = " LIMIT {$offset}, {$perPage}"; $items = DB::select( - $select . $from . $where . $group . $having . $limit + $select . $from . $where . $order . $group . $having . $limit ); foreach ($items as &$item) {