master
cody 2 weeks ago
parent 6e04558f4e
commit 1180a98c16

@ -308,30 +308,34 @@ class OtherController extends CommonController
} }
} }
// 附加历史课程数据 // 附加历史课程数据
// $historyCourses = HistoryCourse::whereHas('calendar', function ($query) { $courseTypesHistory = CourseType::where('is_history', 1)->whereIn('id', $course_type_id)->get();
// $query->where('is_count_people', 1); foreach ($courseTypesHistory as $historyCourse) {
// })->where(function ($query) use ($start_date, $end_date) { $courses3 = HistoryCourse::whereHas('calendar', function ($query) {
// // 开始结束日期的筛选。or查询 $query->where('is_count_people', 1);
// $query->whereBetween('start_time', [$start_date, $end_date]) })->where(function ($query) use ($start_date, $end_date) {
// ->orWhereBetween('end_time', [$start_date, $end_date]); // 开始结束日期的筛选。or查询
// })->where(function ($query) { $query->whereBetween('start_time', [$start_date, $end_date])
// $course_type_id = request('course_type_id'); ->orWhereBetween('end_time', [$start_date, $end_date]);
// if ($course_type_id) { })->where('type', $historyCourse->id)->get();
// $course_type_id = explode(',', $course_type_id); foreach ($courses3 as $course) {
// $query->whereIn('type', $course_type_id); $courseTypesSum[] = [
// } 'course_type' => $historyCourse->name,
// })->get(); 'course_name' => $course->name,
// foreach ($historyCourses as $historyCourse) { // 培养人数
// $courseTypesSum[] = [ 'course_type_signs_pass' => $course->course_type_signs_pass,
// 'course_type' => $historyCourse->typeDetail->name, // 去重培养人数
// // 培养人数 'course_type_signs_pass_unique' => $course->course_type_signs_pass_unique,
// 'course_type_signs_pass' => $historyCourses->where('type', $historyCourse->type)->sum('course_type_signs_pass'), // 课程人数
// // 去重培养人数 'course_signs_pass' => $course->course_signs_pass,
// 'course_type_signs_pass_unique' => $historyCourses->where('type', $historyCourse->type)->sum('course_type_signs_pass_unique'), // 跟班学员数量
// 'course_name' => $historyCourse->course_name, 'genban_total' => 0,
// 'course_signs_pass' => $historyCourse->course_signs_pass, // 被投企业数
// ]; 'yh_invested_total' => 0,
// } // 元禾同事数
'company_join_total' => 0,
];
}
}
// 区域明细统计 // 区域明细统计
$areas = CourseSign::area($start_date, $end_date, 1, $courses->pluck('id'), true); $areas = CourseSign::area($start_date, $end_date, 1, $courses->pluck('id'), true);

Loading…
Cancel
Save