diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 91cb0f0..76cdfb5 100755 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -329,14 +329,11 @@ class UserController extends BaseController return Excel::download(new CommonExport($list, $all['export_fields'] ?? ''), $all['file_name'] ?? '' . date('YmdHis') . '.xlsx'); } else { $total = $this->model->whereHas('courseSigns')->count(); - // 本年度报名人数 - $year_total = CourseSign::where('created_at', 'like', '%' . $year . '%')->whereNotIn('status', [4, 5]) - ->where(function ($query) use ($year) { - $query->whereHas('course', function ($q) use ($year) { - $q->where('start_date', 'like', '%' . $year . '%'); - }); - })->count(); - + $year_total = $this->model->whereHas('courseSigns', function ($query) use ($year) { + $query->whereHas('course', function ($q) use ($year) { + $q->where('year', $year); + }); + })->count(); // 年度培养学员 $year_training_total = $this->model->whereHas('courseSigns', function ($query) use ($year) { $query->where('status', 1)->whereHas('course', function ($q) use ($year) {