diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php index 87b1212..83bd3e9 100755 --- a/app/Models/CourseSign.php +++ b/app/Models/CourseSign.php @@ -114,7 +114,7 @@ class CourseSign extends SoftDeletesModel // 开始结束日期的筛选。or查询 $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'); + })->where('type', request('course_type_id', 0))->sum('course_type_signs_pass'); // 返回统计数据 return $historyTotal + $baseTotal; } @@ -137,7 +137,7 @@ class CourseSign extends SoftDeletesModel // 开始结束日期的筛选。or查询 $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_unique'); + })->where('type', request('course_type_id', 0))->sum('course_type_signs_pass_unique'); // 统计数据 return $baseTotal + $historyTotal; } @@ -357,7 +357,7 @@ class CourseSign extends SoftDeletesModel public static function rencai($start_date = null, $end_date = null, $course_ids = null, $retList = false) { $courseSignsQuery = self::getStudentList($start_date, $end_date, 1, $course_ids); - $courseSigns = $courseSignsQuery->whereHas('course', function ($query) use ($start_date, $end_date) { + $courseSigns = $courseSignsQuery->whereHas('course', function ($query) { $query->where('typeDetail', function ($q) { $q->where('name', '人才培训'); }); @@ -367,7 +367,6 @@ class CourseSign extends SoftDeletesModel } else { return User::whereIn('id', $courseSigns->pluck('user_id'))->count(); } - } /**