|
|
|
|
@ -277,10 +277,10 @@ class OtherController extends CommonController
|
|
|
|
|
// 开始结束日期的筛选。or查询
|
|
|
|
|
$query->whereBetween('start_date', [$start_date, $end_date])
|
|
|
|
|
->orWhereBetween('end_date', [$start_date, $end_date]);
|
|
|
|
|
})->get();
|
|
|
|
|
})->where('type', $course_type_id)->get();
|
|
|
|
|
foreach ($historyCourses as $historyCourse) {
|
|
|
|
|
$courseTypesSum[] = [
|
|
|
|
|
'course_type' => $historyCourse->course_type,
|
|
|
|
|
'course_type' => $historyCourse->typeDetail->name,
|
|
|
|
|
// 培养人数
|
|
|
|
|
'course_type_signs_pass' => $historyCourse->course_type_signs_pass,
|
|
|
|
|
// 去重培养人数
|
|
|
|
|
|