diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php index 029bef6..25fb440 100755 --- a/app/Http/Controllers/Admin/OtherController.php +++ b/app/Http/Controllers/Admin/OtherController.php @@ -233,9 +233,11 @@ 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]); - })->where(function ($query) use ($courses) { - if (request('course_type_id')) { - $query->whereIn('course_type_id', request('course_type_id')); + })->where(function ($query) { + $course_type_id = request('course_type_id'); + if ($course_type_id) { + $course_type_id = explode(',', $course_type_id); + $query->whereIn('course_type_id1', $course_type_id); } }); $list['course_total'] = (clone $calendar)->count(); @@ -308,7 +310,13 @@ class OtherController extends CommonController // 开始结束日期的筛选。or查询 $query->whereBetween('start_time', [$start_date, $end_date]) ->orWhereBetween('end_time', [$start_date, $end_date]); - })->where('type', $course_type_id)->get(); + })->where(function ($query) { + $course_type_id = request('course_type_id', ''); + $course_type_id = explode(',', $course_type_id); + if ($course_type_id) { + $query->whereIn('type', $course_type_id); + } + })->get(); foreach ($historyCourses as $historyCourse) { $courseTypesSum[] = [ 'course_type' => $historyCourse->typeDetail->name, @@ -699,11 +707,12 @@ class OtherController extends CommonController // 开课场次明细 - 与coursesHome算法一致 $calendars = Calendar::whereBetween('date', [$start_date, $end_date]) ->where(function ($query) use ($course_ids) { - if (request('course_type_id')) { - $query->whereIn('course_id', $course_ids); + $course_type_id = request('course_type_id'); + if ($course_type_id) { + $course_type_id = explode(',', $course_type_id); + $query->whereIn('course_type_id', $course_type_id); } - }) - ->with('course') + })->with('course') ->get(); foreach ($calendars as $calendar) { @@ -731,8 +740,10 @@ class OtherController extends CommonController // 开课天数明细 - 与coursesHome算法一致 $calendars = Calendar::whereBetween('date', [$start_date, $end_date]) ->where(function ($query) use ($course_ids) { - if (request('course_type_id')) { - $query->whereIn('course_type_id', request('course_type_id')); + $course_type_id = request('course_type_id'); + if ($course_type_id) { + $course_type_id = explode(',', $course_type_id); + $query->whereIn('course_type_id', $course_type_id); } })->where('is_count_days', 1) ->with('course') diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php index e0543e3..7725356 100755 --- a/app/Models/CourseSign.php +++ b/app/Models/CourseSign.php @@ -116,7 +116,13 @@ class CourseSign extends SoftDeletesModel // 开始结束日期的筛选。or查询 $query->whereBetween('start_time', [$start_date, $end_date]) ->orWhereBetween('end_time', [$start_date, $end_date]); - })->where('type', request('course_type_id', 0))->sum('course_type_signs_pass'); + })->where(function ($query) { + $course_type_id = request('course_type_id', ''); + $course_type_id = explode(',', $course_type_id); + if ($course_type_id) { + $query->whereIn('type', $course_type_id); + } + })->sum('course_type_signs_pass'); // 返回统计数据 return $historyTotal + $baseTotal; } @@ -141,7 +147,13 @@ class CourseSign extends SoftDeletesModel // 开始结束日期的筛选。or查询 $query->whereBetween('start_time', [$start_date, $end_date]) ->orWhereBetween('end_time', [$start_date, $end_date]); - })->where('type', request('course_type_id', 0))->sum('course_type_signs_pass_unique'); + })->where(function ($query) { + $course_type_id = request('course_type_id', ''); + $course_type_id = explode(',', $course_type_id); + if ($course_type_id) { + $query->whereIn('type', $course_type_id); + } + })->sum('course_type_signs_pass_unique'); // 统计数据 return $baseTotal + $historyTotal; }