diff --git a/app/Http/Controllers/Admin/ChartController.php b/app/Http/Controllers/Admin/ChartController.php index fbdb50a..759e825 100644 --- a/app/Http/Controllers/Admin/ChartController.php +++ b/app/Http/Controllers/Admin/ChartController.php @@ -34,20 +34,20 @@ class ChartController extends CommonController 'common_visit' => [ 'total' => Visit::where('type', 1)->count(), 'enter_visit' => Visit::where('type', 1)->whereNotNull('accept_admin_sign')->count(), - 'today_total' => Visit::where('type', 1)->whereDate('created_at', date('Y-m-d'))->count(), - 'today_enter_visit' => Visit::where('type', 1)->whereDate('created_at', date('Y-m-d'))->whereNotNull('accept_admin_sign')->count(), + 'today_total' => Visit::where('type', 1)->where('date', date('Y-m-d'))->count(), + 'today_enter_visit' => Visit::where('type', 1)->where('date', date('Y-m-d'))->whereNotNull('accept_admin_sign')->count(), ], 'work_visit' => [ 'total' => Visit::where('type', 2)->count(), 'enter_visit' => Visit::where('type', 2)->whereNotNull('accept_admin_sign')->count(), - 'today_total' => Visit::where('type', 2)->whereDate('created_at', date('Y-m-d'))->count(), - 'today_enter_visit' => Visit::where('type', 2)->whereDate('created_at', date('Y-m-d'))->whereNotNull('accept_admin_sign')->count(), + 'today_total' => Visit::where('type', 2)->where('date', date('Y-m-d'))->count(), + 'today_enter_visit' => Visit::where('type', 2)->where('date', date('Y-m-d'))->whereNotNull('accept_admin_sign')->count(), ], 'car_visit' => [ 'total' => Visit::where('type', 3)->count(), 'enter_visit' => Visit::where('type', 3)->whereNotNull('accept_admin_sign')->count(), - 'today_total' => Visit::where('type', 3)->whereDate('created_at', date('Y-m-d'))->count(), - 'today_enter_visit' => Visit::where('type', 3)->whereDate('created_at', date('Y-m-d'))->whereNotNull('accept_admin_sign')->count(), + 'today_total' => Visit::where('type', 3)->where('date', date('Y-m-d'))->count(), + 'today_enter_visit' => Visit::where('type', 3)->where('date', date('Y-m-d'))->whereNotNull('accept_admin_sign')->count(), ], ]; $startDate = date('Y-m-d', strtotime('-30 day', time())); @@ -56,9 +56,9 @@ class ChartController extends CommonController foreach ($dateList as &$item) { $allDateList[] = [ 'date' => $item, - 'common_visit' => Visit::where('type', 1)->whereDate('created_at', $item)->count(), - 'work_visit' => Visit::where('type', 2)->whereDate('created_at', $item)->count(), - 'car_visit' => Visit::where('type', 3)->whereDate('created_at', $item)->count(), + 'common_visit' => Visit::where('type', 1)->where('date', $item)->count(), + 'work_visit' => Visit::where('type', 2)->where('date', $item)->count(), + 'car_visit' => Visit::where('type', 3)->where('date', $item)->count(), ]; } return $this->success(compact('list', 'all_date_list'));