diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php index f9773a5..b53cf86 100755 --- a/app/Http/Controllers/Admin/OtherController.php +++ b/app/Http/Controllers/Admin/OtherController.php @@ -317,21 +317,18 @@ class OtherController extends CommonController $query->whereIn('type', $course_type_id); } })->get(); - $historyCoursesType = CourseType::whereIn('id', $historyCourses->pluck('type'))->get(); - foreach ($historyCoursesType as $historyCourseType) { - $historyCourses = $historyCourses->where('type', $historyCourseType->id); - foreach ($historyCourses as $historyCourse) { - $courseTypesSum[] = [ - 'course_type' => $historyCourseType->name, - // 培养人数 - 'course_type_signs_pass' => $historyCourses->sum('course_type_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, - ]; - } + foreach ($historyCourses as $historyCourse) { + $courseTypesSum[] = [ + 'course_type' => $historyCourse->typeDetail->name, + // 培养人数 + 'course_type_signs_pass' => $historyCourses->where('type', $historyCourse->type)->sum('course_type_signs_pass'), + // 去重培养人数 + 'course_type_signs_pass_unique' => $historyCourses->where('type', $historyCourse->type)->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); return $this->success(compact('list', 'courseTypesSum', 'areas'));