master
cody 2 weeks ago
parent 4dace3e94f
commit 6bfbece1b1

@ -317,21 +317,18 @@ class OtherController extends CommonController
$query->whereIn('type', $course_type_id); $query->whereIn('type', $course_type_id);
} }
})->get(); })->get();
$historyCoursesType = CourseType::whereIn('id', $historyCourses->pluck('type'))->get(); foreach ($historyCourses as $historyCourse) {
foreach ($historyCoursesType as $historyCourseType) { $courseTypesSum[] = [
$historyCourses = $historyCourses->where('type', $historyCourseType->id); 'course_type' => $historyCourse->typeDetail->name,
foreach ($historyCourses as $historyCourse) { // 培养人数
$courseTypesSum[] = [ 'course_type_signs_pass' => $historyCourses->where('type', $historyCourse->type)->sum('course_type_signs_pass'),
'course_type' => $historyCourseType->name, // 去重培养人数
// 培养人数 'course_type_signs_pass_unique' => $historyCourses->where('type', $historyCourse->type)->sum('course_type_signs_pass_unique'),
'course_type_signs_pass' => $historyCourses->sum('course_type_signs_pass'), 'course_name' => $historyCourse->course_name,
// 去重培养人数 'course_signs_pass' => $historyCourse->course_signs_pass,
'course_type_signs_pass_unique' => $historyCourses->sum('course_type_signs_pass_unique'), ];
'course_name' => $historyCourse->course_name,
'course_signs_pass' => $historyCourse->course_signs_pass,
];
}
} }
// 区域明细统计 // 区域明细统计
$areas = CourseSign::area($start_date, $end_date, 1, $courses->pluck('id'), true); $areas = CourseSign::area($start_date, $end_date, 1, $courses->pluck('id'), true);
return $this->success(compact('list', 'courseTypesSum', 'areas')); return $this->success(compact('list', 'courseTypesSum', 'areas'));

Loading…
Cancel
Save