From ba08383ff616c6f15c29a94e54a899e5ad6a7764 Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Fri, 22 Aug 2025 17:59:46 +0800 Subject: [PATCH] update --- app/Http/Controllers/Admin/OtherController.php | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php index cb33c19..1ff1832 100755 --- a/app/Http/Controllers/Admin/OtherController.php +++ b/app/Http/Controllers/Admin/OtherController.php @@ -182,19 +182,14 @@ class OtherController extends CommonController // 区域明细统计 $areas = ParameterDetail::where('parameter_id', 5)->get(); foreach ($areas as $area) { - $area->course_signs_pass = CourseSign::where('status', 1) + $courseSignByArea = CourseSign::where('status', 1) ->whereHas('user', function ($query) use ($area) { $query->where('company_area', $area->value); })->whereDate('created_at', '>=', $start_date) ->whereDate('created_at', '<=', $end_date) - ->count(); - $area->course_signs_pass_unique = CourseSign::where('status', 1) - ->whereHas('user', function ($query) use ($area) { - $query->where('company_area', $area->value); - })->whereDate('created_at', '>=', $start_date) - ->whereDate('created_at', '<=', $end_date) - ->distinct('user_id') - ->count(); + ->get(); + $area->course_signs_pass = $courseSignByArea->count(); + $area->course_signs_pass_unique = User::whereIn('id', $courseSignByArea->pluck('user_id'))->distinct('mobile')->count(); } return $this->success(compact('list', 'courseTypesSum', 'areas', 'sql')); }