diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php index d004d58..f651cab 100755 --- a/app/Http/Controllers/Admin/OtherController.php +++ b/app/Http/Controllers/Admin/OtherController.php @@ -297,7 +297,7 @@ class OtherController extends CommonController // 去重培养人数 'course_type_signs_pass_unique' => CourseSign::courseSignsTotalByUnique($start_date, $end_date, 1, $courses2->pluck('id'), false, false), 'course_name' => $course->name, - 'course_signs_pass' => CourseSign::courseSignsTotal($start_date, $end_date, 1, [$course->id],false,false), + 'course_signs_pass' => CourseSign::courseSignsTotal($start_date, $end_date, 1, [$course->id], false, false), // 跟班学员数量 'genban_total' => CourseSign::genban($start_date, $end_date, [$course->id]), // 被投企业数 diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 7d2ac42..3f584c2 100755 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -210,10 +210,10 @@ class UserController extends BaseController $query->with('course.typeDetail')->orderBy('fee_status', 'desc'); } ])->withCount([ - 'appointments' => function ($query) { - $query->whereIn('status', [0, 1]); - } - ]); + 'appointments' => function ($query) { + $query->whereIn('status', [0, 1]); + } + ]); // 是否被投企业 if (isset($all['is_yh_invested'])) { $list = $list->whereHas('company', function ($query) use ($all) { @@ -287,7 +287,7 @@ class UserController extends BaseController } $list = $list->where(function ($query) use ($all) { if (isset($all['from'])) { - $query->where('from', $all['from']); + $query->where('from', 'like', '%' . $all['from'] . '%'); } if (isset($all['is_vip'])) { $query->where('is_vip', $all['is_vip']); @@ -540,8 +540,7 @@ class UserController extends BaseController } else { if (in_array($k, ['company_type', 'type'])) { $list[$key][$k] = str_replace('、', ',', $value[$v]); - $list[$key][$k] = str_replace(',', ',', $list[$key][$k]); - ; + $list[$key][$k] = str_replace(',', ',', $list[$key][$k]);; } else { $list[$key][$k] = $value[$v]; }