|
|
|
|
@ -523,11 +523,6 @@ class CourseSign extends SoftDeletesModel
|
|
|
|
|
'常州团队',
|
|
|
|
|
'国企元禾'
|
|
|
|
|
];
|
|
|
|
|
// $company = Company::where(function ($query) use ($companyNameKeyword) {
|
|
|
|
|
// foreach ($companyNameKeyword as $item) {
|
|
|
|
|
// $query->orWhere('company_name', 'like', '%' . $item . '%');
|
|
|
|
|
// }
|
|
|
|
|
// })->get();
|
|
|
|
|
$list = User::whereIn('id', $courseSignByType->pluck('user_id'))
|
|
|
|
|
->where(function ($query) use ($companyNameKeyword) {
|
|
|
|
|
foreach ($companyNameKeyword as $item) {
|
|
|
|
|
@ -555,9 +550,15 @@ class CourseSign extends SoftDeletesModel
|
|
|
|
|
public static function ganbu($start_date = null, $end_date = null, $course_ids = null, $retList = false)
|
|
|
|
|
{
|
|
|
|
|
$courseSignsQuery = self::getStudentList($start_date, $end_date, 1, $course_ids);
|
|
|
|
|
// 获取需要统计跟班学员的课程
|
|
|
|
|
$genbanCourse = Course::whereHas('typeDetail', function ($query) {
|
|
|
|
|
$query->where('is_count_genban', 1);
|
|
|
|
|
})->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();
|
|
|
|
|
} else {
|
|
|
|
|
|