master
cody 2 weeks ago
parent 594ff9f3ad
commit 3a88905ce1

@ -311,9 +311,9 @@ class OtherController extends CommonController
$query->whereBetween('start_time', [$start_date, $end_date]) $query->whereBetween('start_time', [$start_date, $end_date])
->orWhereBetween('end_time', [$start_date, $end_date]); ->orWhereBetween('end_time', [$start_date, $end_date]);
})->where(function ($query) { })->where(function ($query) {
$course_type_id = request('course_type_id', ''); $course_type_id = request('course_type_id');
$course_type_id = explode(',', $course_type_id);
if ($course_type_id) { if ($course_type_id) {
$course_type_id = explode(',', $course_type_id);
$query->whereIn('type', $course_type_id); $query->whereIn('type', $course_type_id);
} }
})->get(); })->get();
@ -321,9 +321,9 @@ class OtherController extends CommonController
$courseTypesSum[] = [ $courseTypesSum[] = [
'course_type' => $historyCourse->typeDetail->name, 'course_type' => $historyCourse->typeDetail->name,
// 培养人数 // 培养人数
'course_type_signs_pass' => $historyCourse->course_type_signs_pass, 'course_type_signs_pass' => $historyCourses->sum('course_type_signs_pass'),
// 去重培养人数 // 去重培养人数
'course_type_signs_pass_unique' => $historyCourse->course_type_signs_pass_unique, 'course_type_signs_pass_unique' => $historyCourses->sum('course_type_signs_pass_unique'),
'course_name' => $historyCourse->course_name, 'course_name' => $historyCourse->course_name,
'course_signs_pass' => $historyCourse->course_signs_pass, 'course_signs_pass' => $historyCourse->course_signs_pass,
]; ];

@ -122,7 +122,7 @@ class CourseSign extends SoftDeletesModel
$course_type_id = explode(',', $course_type_id); $course_type_id = explode(',', $course_type_id);
$query->whereIn('type', $course_type_id); $query->whereIn('type', $course_type_id);
} }
})->sum('course_type_signs_pass1'); })->sum('course_type_signs_pass');
// 返回统计数据 // 返回统计数据
return $historyTotal + $baseTotal; return $historyTotal + $baseTotal;
} }

Loading…
Cancel
Save