|
|
|
|
@ -266,8 +266,7 @@ class OtherController extends CommonController
|
|
|
|
|
// 培养人数
|
|
|
|
|
'course_type_signs_pass' => CourseSign::courseSignsTotal($start_date, $end_date, 1, $courses2->pluck('id')),
|
|
|
|
|
// 去重培养人数
|
|
|
|
|
'course_type_signs_pass_unique' => CourseSign::courseSignsTotalByUnique($start_date, $end_date, 1, $courses2->pluck('id'), null, $userIds),
|
|
|
|
|
'user_ids' => $userIds,
|
|
|
|
|
'course_type_signs_pass_unique' => CourseSign::courseSignsTotalByUnique($start_date, $end_date, 1, $courses2->pluck('id'), null),
|
|
|
|
|
'course_name' => $course->name,
|
|
|
|
|
'course_signs_pass' => CourseSign::courseSignsTotal($start_date, $end_date, 1, [$course->id]),
|
|
|
|
|
];
|
|
|
|
|
@ -277,12 +276,9 @@ class OtherController extends CommonController
|
|
|
|
|
$areas = ParameterDetail::where('parameter_id', 5)->get();
|
|
|
|
|
foreach ($areas as $area) {
|
|
|
|
|
$area->course_signs_pass = CourseSign::courseSignsTotal($start_date, $end_date, 1, $courses->pluck('id'), $area->value);
|
|
|
|
|
$area->course_signs_pass_unique = CourseSign::courseSignsTotalByUnique($start_date, $end_date, 1, $courses->pluck('id'), $area->value, $userIds);
|
|
|
|
|
$area->user_ids = $userIds;
|
|
|
|
|
$area->course_signs_pass_unique = CourseSign::courseSignsTotalByUnique($start_date, $end_date, 1, $courses->pluck('id'), $area->value);
|
|
|
|
|
}
|
|
|
|
|
$area_course_signs_pass_total = collect($areas)->sum('course_signs_pass');
|
|
|
|
|
$area_course_signs_pass_unique_total = collect($areas)->sum('course_signs_pass_unique');
|
|
|
|
|
return $this->success(compact('list', 'courseTypesSum', 'areas', 'area_course_signs_pass_total', 'area_course_signs_pass_unique_total'));
|
|
|
|
|
return $this->success(compact('list', 'courseTypesSum', 'areas'));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|