From 3d8e2e3db068f8393935474aaef6fe1fef4ed908 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Wed, 3 Sep 2025 10:31:54 +0800
Subject: [PATCH] update

---
 .../Controllers/Admin/OtherController.php     | 22 +++++--------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php
index 22ae5a2..a346c15 100755
--- a/app/Http/Controllers/Admin/OtherController.php
+++ b/app/Http/Controllers/Admin/OtherController.php
@@ -157,27 +157,15 @@ class OtherController extends CommonController
                 ->where('start_date', '<=', $end_date)
                 ->where('type', $courseType->id)
                 ->get();
-            $courseSignByType = CourseSign::where('status', 1)
-                ->whereIn('course_id', $courses2->pluck('id'))
-                ->whereNotIn('status', [4, 5])
-                ->whereDate('created_at', '>=', $start_date)
-                ->whereDate('created_at', '<=', $end_date)
-                ->get();
-            // 培养人数
-            $courseTypeSignsPass = $courseSignByType->count();
-            // 去重培养人数
-            $courseTypeSignsPassUnique = User::whereIn('id', $courseSignByType->pluck('user_id'))->distinct('mobile')->count();
             foreach ($courses2 as $course) {
                 $courseTypesSum[] = [
                     'course_type' => $courseType->name,
-                    'course_type_signs_pass' => $courseTypeSignsPass,
-                    'course_type_signs_pass_unique' => $courseTypeSignsPassUnique,
+                    // 培养人数
+                    'course_type_signs_pass' => CourseSign::courseSignsTotal($start_date, $end_date, 1, $courses2->pluck('id')->toArray()),
+                    // 去重培养人数
+                    'course_type_signs_pass_unique' => CourseSign::courseSignsTotalByUnique($start_date, $end_date, 1, $courses2->pluck('id')->toArray()),
                     'course_name' => $course->name,
-                    'course_signs_pass' => CourseSign::where('status', 1)
-                        ->where('course_id', $course->id)
-                        ->whereDate('created_at', '>=', $start_date)
-                        ->whereDate('created_at', '<=', $end_date)
-                        ->count()
+                    'course_signs_pass' => CourseSign::courseSignsTotal($start_date, $end_date, 1, [$course->id]),
                 ];
             }