diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php index df4617e..5a5d2b5 100755 --- a/app/Http/Controllers/Admin/OtherController.php +++ b/app/Http/Controllers/Admin/OtherController.php @@ -222,7 +222,7 @@ class OtherController extends CommonController $course_type_id = $params['course_type_id']; $courses = $params['courses']; // 被投企业数 - // $list['course_signs_invested'] = CourseSign::yhInvested($start_date, $end_date, $courses->pluck('id')->toArray()); + $list['course_signs_invested'] = CourseSign::yhInvested($start_date, $end_date, $courses->pluck('id')->toArray()); // 报名人数 $list['course_signs_total'] = CourseSign::courseSignsTotal($start_date, $end_date, null, $courses->pluck('id')); // 审核通过人数 diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php index 5da07c6..eafe558 100755 --- a/app/Models/CourseSign.php +++ b/app/Models/CourseSign.php @@ -212,9 +212,14 @@ class CourseSign extends SoftDeletesModel public static function genban($start_date, $end_date, $course_ids = null, $retList = false) { $courseSignsQuery = self::getStudentList($start_date, $end_date, 1, $course_ids); + // 获取制定的课程id + $genbanCourse = Course::whereHas('typeDetail', function ($query) { + $query->whereIn('id', [1, 3, 14]); + })->get(); + $courseSigns = $courseSignsQuery->whereHas('user', function ($query) { $query->where('from', 'like', '%跟班学员%'); - })->get(); + })->whereIn('course_id', $genbanCourse->pluck('id'))->get(); if ($retList) { return User::with('company')->whereIn('id', $courseSigns->pluck('user_id'))->get();