|
|
|
|
@ -89,8 +89,8 @@ class CourseSign extends SoftDeletesModel
|
|
|
|
|
})->whereHas('course', function ($query) use ($start_date, $end_date) {
|
|
|
|
|
// 开始结束日期的筛选。or查询
|
|
|
|
|
if ($start_date && $end_date) {
|
|
|
|
|
$query->whereBetween('start_date', [$start_date, $end_date])
|
|
|
|
|
->orWhereBetween('end_date', [$start_date, $end_date]);
|
|
|
|
|
$query->whereBetween('start_time', [$start_date, $end_date])
|
|
|
|
|
->orWhereBetween('end_time', [$start_date, $end_date]);
|
|
|
|
|
}
|
|
|
|
|
})->whereNotIn('status', [4, 5, 6]);
|
|
|
|
|
return $baseQuery;
|
|
|
|
|
@ -112,8 +112,8 @@ class CourseSign extends SoftDeletesModel
|
|
|
|
|
// 历史数据
|
|
|
|
|
$historyTotal = HistoryCourse::where(function ($query) use ($start_date, $end_date) {
|
|
|
|
|
// 开始结束日期的筛选。or查询
|
|
|
|
|
$query->whereBetween('start_date', [$start_date, $end_date])
|
|
|
|
|
->orWhereBetween('end_date', [$start_date, $end_date]);
|
|
|
|
|
$query->whereBetween('start_time', [$start_date, $end_date])
|
|
|
|
|
->orWhereBetween('end_time', [$start_date, $end_date]);
|
|
|
|
|
})->where('type', request('course_type_id',0))->sum('course_type_signs_pass');
|
|
|
|
|
// 返回统计数据
|
|
|
|
|
return $historyTotal + $baseTotal;
|
|
|
|
|
|