master
cody 2 weeks ago
parent 4a7865b6b4
commit 4a01066be0

@ -292,7 +292,7 @@ class OtherController extends CommonController
}
}
// 附加历史课程数据
$historyCourses = HistoryCourse::where('calendar', function ($query) {
$historyCourses = HistoryCourse::whereHas('calendar', function ($query) {
$query->where('is_count_people', 1);
})->where(function ($query) use ($start_date, $end_date) {
// 开始结束日期的筛选。or查询

@ -110,7 +110,7 @@ class CourseSign extends SoftDeletesModel
// 基础数据
$baseTotal = $totalQuery->count();
// 历史数据
$historyTotal = HistoryCourse::where('calendar', function ($query) {
$historyTotal = HistoryCourse::whereHas('calendar', function ($query) {
$query->where('is_count_people', 1);
})->where(function ($query) use ($start_date, $end_date) {
// 开始结束日期的筛选。or查询
@ -135,7 +135,7 @@ class CourseSign extends SoftDeletesModel
} else {
$baseTotal = $user->count();
// 历史数据
$historyTotal = HistoryCourse::where('calendar', function ($query) {
$historyTotal = HistoryCourse::whereHas('calendar', function ($query) {
$query->where('is_count_people', 1);
})->where(function ($query) use ($start_date, $end_date) {
// 开始结束日期的筛选。or查询

Loading…
Cancel
Save