|
@@ -250,7 +250,12 @@ class OrderService
|
|
$orderWhere['company_id'] = $companyId;
|
|
$orderWhere['company_id'] = $companyId;
|
|
$orderWhere['next_date'] = ['neq',''];
|
|
$orderWhere['next_date'] = ['neq',''];
|
|
$orderWhere['status'] = 3;
|
|
$orderWhere['status'] = 3;
|
|
- $order = Db::name('order')->field('id,user_car_id,user_car_number,next_date')->where($orderWhere)->group('user_car_id')->order('finish_time desc')->select();
|
|
+ $subQuery = Db::name('order')->alias('o')->where($orderWhere)
|
|
|
|
+ ->order(['finish_time' => 'desc'])
|
|
|
|
+ ->buildSql();
|
|
|
|
+
|
|
|
|
+ $order = Db::table($subQuery)->alias('o')->field('id,user_car_id,user_car_number,next_date')
|
|
|
|
+ ->group('user_car_id')->order('finish_time desc')->select();
|
|
$row = [];
|
|
$row = [];
|
|
if (!empty($order)) {
|
|
if (!empty($order)) {
|
|
foreach ($order as $key => $value) {
|
|
foreach ($order as $key => $value) {
|