master
cody 2 weeks ago
parent 2008de40dd
commit 0783f4ca09

@ -277,10 +277,10 @@ class OtherController extends CommonController
// 开始结束日期的筛选。or查询 // 开始结束日期的筛选。or查询
$query->whereBetween('start_date', [$start_date, $end_date]) $query->whereBetween('start_date', [$start_date, $end_date])
->orWhereBetween('end_date', [$start_date, $end_date]); ->orWhereBetween('end_date', [$start_date, $end_date]);
})->get(); })->where('type', $course_type_id)->get();
foreach ($historyCourses as $historyCourse) { foreach ($historyCourses as $historyCourse) {
$courseTypesSum[] = [ $courseTypesSum[] = [
'course_type' => $historyCourse->course_type, 'course_type' => $historyCourse->typeDetail->name,
// 培养人数 // 培养人数
'course_type_signs_pass' => $historyCourse->course_type_signs_pass, 'course_type_signs_pass' => $historyCourse->course_type_signs_pass,
// 去重培养人数 // 去重培养人数

@ -179,14 +179,7 @@ class CourseSign extends SoftDeletesModel
return $list; return $list;
} else { } else {
// 返回统计数据 // 返回统计数据
$baseTotal = $list->count(); return $list->count();
// 历史数据
$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]);
})->where('type', request('course_type_id'))->sum('course_type_signs_pass_unique');
return $baseTotal + $historyTotal;
} }
} }

@ -4,5 +4,10 @@ namespace App\Models;
class HistoryCourse extends SoftDeletesModel class HistoryCourse extends SoftDeletesModel
{ {
public function typeDetail()
{
return $this->hasOne(CourseType::class, 'id', 'type');
}
} }

Loading…
Cancel
Save