From dd8d71ceb6af6985e6d32233d3ece149c4759f95 Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Wed, 26 Nov 2025 21:46:08 +0800 Subject: [PATCH] update --- app/Http/Controllers/Admin/OtherController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php index 3e6c960..98ff405 100755 --- a/app/Http/Controllers/Admin/OtherController.php +++ b/app/Http/Controllers/Admin/OtherController.php @@ -233,7 +233,7 @@ class OtherController extends CommonController $calendar = Calendar::where(function ($query) use ($start_date, $end_date) { $query->whereBetween('start_time', [$start_date, $end_date]) ->orWhereBetween('end_time', [$start_date, $end_date]); - }); + })->whereIn('course_id', $courses->pluck('id')); $list['course_total'] = (clone $calendar)->count(); // 开课天数 $list['course_day_total'] = (clone $calendar)->where('is_count_days', 1)->sum('days'); @@ -707,8 +707,9 @@ class OtherController extends CommonController case 'course_day_total': // 开课天数明细 - 与coursesHome算法一致 - $calendars = Calendar::where('is_count_days', 1) + $calendars = Calendar::whereIn('course_id', $course_ids) ->whereBetween('date', [$start_date, $end_date]) + ->where('is_count_days', 1) ->with('course') ->get();