|
|
|
@ -112,7 +112,7 @@ class CourseSign extends SoftDeletesModel
|
|
|
|
// 历史数据
|
|
|
|
// 历史数据
|
|
|
|
$historyTotal = HistoryCourse::whereHas('calendar', function ($query) {
|
|
|
|
$historyTotal = HistoryCourse::whereHas('calendar', function ($query) {
|
|
|
|
$query->where('is_count_people', 1);
|
|
|
|
$query->where('is_count_people', 1);
|
|
|
|
})->where('typeDetail', function ($query) {
|
|
|
|
})->whereHas('typeDetail', function ($query) {
|
|
|
|
$query->where('is_history', 1);
|
|
|
|
$query->where('is_history', 1);
|
|
|
|
})->where(function ($query) use ($start_date, $end_date) {
|
|
|
|
})->where(function ($query) use ($start_date, $end_date) {
|
|
|
|
// 开始结束日期的筛选。or查询
|
|
|
|
// 开始结束日期的筛选。or查询
|
|
|
|
@ -145,7 +145,7 @@ class CourseSign extends SoftDeletesModel
|
|
|
|
// 历史数据
|
|
|
|
// 历史数据
|
|
|
|
$historyTotal = HistoryCourse::whereHas('calendar', function ($query) {
|
|
|
|
$historyTotal = HistoryCourse::whereHas('calendar', function ($query) {
|
|
|
|
$query->where('is_count_people', 1);
|
|
|
|
$query->where('is_count_people', 1);
|
|
|
|
})->where('typeDetail', function ($query) {
|
|
|
|
})->whereHas('typeDetail', function ($query) {
|
|
|
|
$query->where('is_history', 1);
|
|
|
|
$query->where('is_history', 1);
|
|
|
|
})->where(function ($query) use ($start_date, $end_date) {
|
|
|
|
})->where(function ($query) use ($start_date, $end_date) {
|
|
|
|
// 开始结束日期的筛选。or查询
|
|
|
|
// 开始结束日期的筛选。or查询
|
|
|
|
|