From 666f9e1e8e62e86e621bd27bb5fb17ecf9638b41 Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Thu, 13 Nov 2025 15:34:19 +0800 Subject: [PATCH] update --- app/Http/Controllers/Admin/OtherController.php | 2 -- app/Models/CourseSign.php | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php index 52760bf..69d28fd 100755 --- a/app/Http/Controllers/Admin/OtherController.php +++ b/app/Http/Controllers/Admin/OtherController.php @@ -159,7 +159,6 @@ class OtherController extends CommonController $courses2 = Course::where('type', $courseType->id) // ->where('start_date', '<=', $end_date) // ->where('start_date', '>=', $start_date) - ->whereIn('id', $courses->pluck('id')) ->get(); foreach ($courses2 as $course) { $courseTypesSum[] = [ @@ -172,7 +171,6 @@ class OtherController extends CommonController 'course_signs_pass' => CourseSign::courseSignsTotal($start_date, $end_date, 1, [$course->id]), ]; } - } // 区域明细统计 $areas = ParameterDetail::where('parameter_id', 5)->get(); diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php index 92866cd..24caf16 100755 --- a/app/Models/CourseSign.php +++ b/app/Models/CourseSign.php @@ -122,9 +122,9 @@ class CourseSign extends SoftDeletesModel if (isset($status)) { $query->where('status', $status); } - if (isset($course_ids)) { - $query->whereIn('course_id', $course_ids); - } +// if (isset($course_ids)) { +// $query->whereIn('course_id', $course_ids); +// } })->whereNotIn('status', [4, 5]) ->get(); return User::whereIn('id', $courseSignByType->pluck('user_id'))->distinct('mobile')->count();