master
cody 2 weeks ago
parent 1a72542463
commit 182918fd76

@ -236,7 +236,7 @@ class OtherController extends CommonController
})->whereIn('course_id', $courses->pluck('id'));
$list['course_total'] = (clone $calendar)->count();
// 开课天数
$list['course_day_total'] = (clone $calendar)->sum('days');
$list['course_day_total'] = (clone $calendar)->where('is_count_days', 1)->sum('days');
// 上市公司数(所有上市公司)
$list['company_market_total'] = Company::companyMarket($start_date, $end_date);
@ -292,7 +292,9 @@ class OtherController extends CommonController
}
}
// 附加历史课程数据
$historyCourses = HistoryCourse::where(function ($query) use ($start_date, $end_date) {
$historyCourses = HistoryCourse::where('calendar', function ($query) {
$query->where('is_count_people', 1);
})->where(function ($query) use ($start_date, $end_date) {
// 开始结束日期的筛选。or查询
$query->whereBetween('start_time', [$start_date, $end_date])
->orWhereBetween('end_time', [$start_date, $end_date]);

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

Loading…
Cancel
Save