From 3a88905ce126476926d8c6d74d13e765a4bd391d Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Thu, 27 Nov 2025 18:01:21 +0800 Subject: [PATCH] update --- app/Http/Controllers/Admin/OtherController.php | 8 ++++---- app/Models/CourseSign.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php index a29d5a4..09f7fa4 100755 --- a/app/Http/Controllers/Admin/OtherController.php +++ b/app/Http/Controllers/Admin/OtherController.php @@ -311,9 +311,9 @@ class OtherController extends CommonController $query->whereBetween('start_time', [$start_date, $end_date]) ->orWhereBetween('end_time', [$start_date, $end_date]); })->where(function ($query) { - $course_type_id = request('course_type_id', ''); - $course_type_id = explode(',', $course_type_id); + $course_type_id = request('course_type_id'); if ($course_type_id) { + $course_type_id = explode(',', $course_type_id); $query->whereIn('type', $course_type_id); } })->get(); @@ -321,9 +321,9 @@ class OtherController extends CommonController $courseTypesSum[] = [ 'course_type' => $historyCourse->typeDetail->name, // 培养人数 - 'course_type_signs_pass' => $historyCourse->course_type_signs_pass, + 'course_type_signs_pass' => $historyCourses->sum('course_type_signs_pass'), // 去重培养人数 - 'course_type_signs_pass_unique' => $historyCourse->course_type_signs_pass_unique, + 'course_type_signs_pass_unique' => $historyCourses->sum('course_type_signs_pass_unique'), 'course_name' => $historyCourse->course_name, 'course_signs_pass' => $historyCourse->course_signs_pass, ]; diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php index d89b9bc..d99da34 100755 --- a/app/Models/CourseSign.php +++ b/app/Models/CourseSign.php @@ -122,7 +122,7 @@ class CourseSign extends SoftDeletesModel $course_type_id = explode(',', $course_type_id); $query->whereIn('type', $course_type_id); } - })->sum('course_type_signs_pass1'); + })->sum('course_type_signs_pass'); // 返回统计数据 return $historyTotal + $baseTotal; }