|
|
|
|
@ -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,
|
|
|
|
|
];
|
|
|
|
|
|