master
cody 4 weeks ago
parent daa83ba3d9
commit 666f9e1e8e

@ -159,7 +159,6 @@ class OtherController extends CommonController
$courses2 = Course::where('type', $courseType->id) $courses2 = Course::where('type', $courseType->id)
// ->where('start_date', '<=', $end_date) // ->where('start_date', '<=', $end_date)
// ->where('start_date', '>=', $start_date) // ->where('start_date', '>=', $start_date)
->whereIn('id', $courses->pluck('id'))
->get(); ->get();
foreach ($courses2 as $course) { foreach ($courses2 as $course) {
$courseTypesSum[] = [ $courseTypesSum[] = [
@ -172,7 +171,6 @@ class OtherController extends CommonController
'course_signs_pass' => CourseSign::courseSignsTotal($start_date, $end_date, 1, [$course->id]), 'course_signs_pass' => CourseSign::courseSignsTotal($start_date, $end_date, 1, [$course->id]),
]; ];
} }
} }
// 区域明细统计 // 区域明细统计
$areas = ParameterDetail::where('parameter_id', 5)->get(); $areas = ParameterDetail::where('parameter_id', 5)->get();

@ -122,9 +122,9 @@ class CourseSign extends SoftDeletesModel
if (isset($status)) { if (isset($status)) {
$query->where('status', $status); $query->where('status', $status);
} }
if (isset($course_ids)) { // if (isset($course_ids)) {
$query->whereIn('course_id', $course_ids); // $query->whereIn('course_id', $course_ids);
} // }
})->whereNotIn('status', [4, 5]) })->whereNotIn('status', [4, 5])
->get(); ->get();
return User::whereIn('id', $courseSignByType->pluck('user_id'))->distinct('mobile')->count(); return User::whereIn('id', $courseSignByType->pluck('user_id'))->distinct('mobile')->count();

Loading…
Cancel
Save