From 2c89ec0457cda3d202677c6b05f3cc7da4a93da1 Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Thu, 15 Jan 2026 14:48:52 +0800 Subject: [PATCH] update --- app/Http/Controllers/Admin/UserController.php | 191 +++++++++--------- 1 file changed, 101 insertions(+), 90 deletions(-) diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 08025a0..629c7e1 100755 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -57,79 +57,79 @@ class UserController extends BaseController $all = request()->all(); $list = $this->model->with(underlineToHump($all['show_relation'] ?? [])) ->with([ - 'courseSigns' => function ($query) use ($all) { - $query->where('status', 1)->with('course.teacher', 'course.typeDetail'); - } - ])->where(function ($query) use ($all) { - if (isset($all['keyword'])) { - $query->whereHas('courses', function ($q) use ($all) { - $q->where('name', 'like', '%' . $all['keyword'] . '%'); - })->orWhere('name', 'like', '%' . $all['keyword'] . '%'); - } - if (isset($all['has_course']) && $all['has_course'] == 1) { - $query->whereHas('courseSigns', function ($q) { - $q->where('status', 1); - }); - } - if (isset($all['filter']) && !empty($all['filter'])) { - foreach ($all['filter'] as $condition) { - $key = $condition['key'] ?? null; - $op = $condition['op'] ?? null; - $value = $condition['value'] ?? null; - if (!isset($key) || !isset($op) || !isset($value)) { + 'courseSigns' => function ($query) use ($all) { + $query->where('status', 1)->with('course.teacher', 'course.typeDetail'); + } + ])->where(function ($query) use ($all) { + if (isset($all['keyword'])) { + $query->whereHas('courses', function ($q) use ($all) { + $q->where('name', 'like', '%' . $all['keyword'] . '%'); + })->orWhere('name', 'like', '%' . $all['keyword'] . '%'); + } + if (isset($all['has_course']) && $all['has_course'] == 1) { + $query->whereHas('courseSigns', function ($q) { + $q->where('status', 1); + }); + } + if (isset($all['filter']) && !empty($all['filter'])) { + foreach ($all['filter'] as $condition) { + $key = $condition['key'] ?? null; + $op = $condition['op'] ?? null; + $value = $condition['value'] ?? null; + if (!isset($key) || !isset($op) || !isset($value)) { + continue; + } + // 等于 + if ($op == 'eq') { + $query->where($key, $value); + } + // 不等于 + if ($op == 'neq') { + $query->where($key, '!=', $value); + } + // 大于 + if ($op == 'gt') { + $query->where($key, '>', $value); + } + // 大于等于 + if ($op == 'egt') { + $query->where($key, '>=', $value); + } + // 小于 + if ($op == 'lt') { + $query->where($key, '<', $value); + } + // 小于等于 + if ($op == 'elt') { + $query->where($key, '<=', $value); + } + // 模糊搜索 + if ($op == 'like') { + $query->where($key, 'like', '%' . $value . '%'); + } + // 否定模糊搜索 + if ($op == 'notlike') { + $query->where($key, 'not like', '%' . $value . '%'); + } + // null搜索 + if ($op == 'null') { + $query->whereNull($key); + } + // notnull搜索 + if ($op == 'notnull') { + $query->whereNotNull($key); + } + // 范围搜索 + if ($op == 'range') { + list($from, $to) = explode(',', $value); + if (empty($from) || empty($to)) { continue; } - // 等于 - if ($op == 'eq') { - $query->where($key, $value); - } - // 不等于 - if ($op == 'neq') { - $query->where($key, '!=', $value); - } - // 大于 - if ($op == 'gt') { - $query->where($key, '>', $value); - } - // 大于等于 - if ($op == 'egt') { - $query->where($key, '>=', $value); - } - // 小于 - if ($op == 'lt') { - $query->where($key, '<', $value); - } - // 小于等于 - if ($op == 'elt') { - $query->where($key, '<=', $value); - } - // 模糊搜索 - if ($op == 'like') { - $query->where($key, 'like', '%' . $value . '%'); - } - // 否定模糊搜索 - if ($op == 'notlike') { - $query->where($key, 'not like', '%' . $value . '%'); - } - // null搜索 - if ($op == 'null') { - $query->whereNull($key); - } - // notnull搜索 - if ($op == 'notnull') { - $query->whereNotNull($key); - } - // 范围搜索 - if ($op == 'range') { - list($from, $to) = explode(',', $value); - if (empty($from) || empty($to)) { - continue; - } - $query->whereBetween($key, [$from, $to]); - } + $query->whereBetween($key, [$from, $to]); } } - })->orderBy($all['sort_name'] ?? 'id', $all['sort_type'] ?? 'desc'); + } + })->orderBy($all['sort_name'] ?? 'id', $all['sort_type'] ?? 'desc'); if (isset($all['is_export']) && !empty($all['is_export'])) { $list = $list->get()->toArray(); $export_fields = $all['export_fields'] ?? []; @@ -168,25 +168,26 @@ class UserController extends BaseController * @OA\Parameter(name="courses_end_date", in="query", @OA\Schema(type="string"), required=false, description="课程结束时间"), * @OA\Parameter(name="is_vip", in="query", @OA\Schema(type="string"), required=false, description="是否vip0否1是"), * @OA\Parameter(name="courses_ing", in="query", @OA\Schema(type="string"), required=false, description="是否课程进行中0否1是"), - * @OA\Parameter(name="is_schoolmate", in="query", @OA\Schema(type="string"), required=false, description="is_schoolmate"), - * @OA\Parameter(name="mobile", in="query", @OA\Schema(type="string"), required=true, description="mobile"), - * @OA\Parameter(name="status", in="query", @OA\Schema(type="string"), required=true, description="审核状态"), - * @OA\Parameter(name="course_type", in="query", @OA\Schema(type="string"), required=true, description="course_type"), - * @OA\Parameter(name="company_has_share", in="query", @OA\Schema(type="string"), required=true, description="是否有股份"), - * @OA\Parameter(name="keyword", in="query", @OA\Schema(type="string"), required=true, description="关键词"), - * @OA\Parameter(name="start_company_date", in="query", @OA\Schema(type="string"), required=true, description="开始成立日期"), - * @OA\Parameter(name="end_company_date", in="query", @OA\Schema(type="string"), required=true, description="结束成立日期"), - * @OA\Parameter(name="start_birthday", in="query", @OA\Schema(type="string"), required=true, description="开始出生日期"), - * @OA\Parameter(name="end_birthday", in="query", @OA\Schema(type="string"), required=true, description="结束出生日期"), + * @OA\Parameter(name="is_schoolmate", in="query", @OA\Schema(type="string"), required=false, description="是否校友0否1是"), + * @OA\Parameter(name="mobile", in="query", @OA\Schema(type="string"), required=false, description="手机号"), + * @OA\Parameter(name="status", in="query", @OA\Schema(type="string"), required=false, description="审核状态：0待审核，1通过，2不通过"), + * @OA\Parameter(name="course_type", in="query", @OA\Schema(type="string"), required=false, description="课程体系ID"), + * @OA\Parameter(name="company_has_share", in="query", @OA\Schema(type="string"), required=false, description="是否有股份0否1是"), + * @OA\Parameter(name="keyword", in="query", @OA\Schema(type="string"), required=false, description="关键词（搜索学校、专业、介绍）"), + * @OA\Parameter(name="start_company_date", in="query", @OA\Schema(type="string"), required=false, description="开始成立日期"), + * @OA\Parameter(name="end_company_date", in="query", @OA\Schema(type="string"), required=false, description="结束成立日期"), + * @OA\Parameter(name="start_birthday", in="query", @OA\Schema(type="string"), required=false, description="开始出生日期"), + * @OA\Parameter(name="end_birthday", in="query", @OA\Schema(type="string"), required=false, description="结束出生日期"), * @OA\Parameter(name="sign_start_date", in="query", @OA\Schema(type="string"), required=false, description="报名开始时间"), * @OA\Parameter(name="sign_end_date", in="query", @OA\Schema(type="string"), required=false, description="报名结束时间"), - * @OA\Parameter(name="company_need_fund", in="query", @OA\Schema(type="string"), required=true, description="是否需要融资"), - * @OA\Parameter(name="is_fee", in="query", @OA\Schema(type="string"), required=true, description="是否缴费0否1是"), - * @OA\Parameter(name="has_openid", in="query", @OA\Schema(type="string"), required=true, description="是否绑定小程序0否1是"), - * @OA\Parameter(name="year", in="query", @OA\Schema(type="string"), required=true, description="年份"), - * @OA\Parameter(name="is_black", in="query", @OA\Schema(type="string"), required=true, description="是否黑名单0否1是"), - * @OA\Parameter(name="is_yh_invested", in="query", @OA\Schema(type="string"), required=true, description="是否元和已投企业0否1是"), - * @OA\Parameter(name="company_tag", in="query", @OA\Schema(type="string"), required=true, description="企业标签"), + * @OA\Parameter(name="company_need_fund", in="query", @OA\Schema(type="string"), required=false, description="是否需要融资0否1是"), + * @OA\Parameter(name="is_fee", in="query", @OA\Schema(type="string"), required=false, description="是否缴费0否1是"), + * @OA\Parameter(name="has_openid", in="query", @OA\Schema(type="string"), required=false, description="是否绑定小程序0否1是"), + * @OA\Parameter(name="year", in="query", @OA\Schema(type="string"), required=false, description="年份，默认为当前年份"), + * @OA\Parameter(name="is_black", in="query", @OA\Schema(type="string"), required=false, description="是否黑名单0否1是"), + * @OA\Parameter(name="is_yh_invested", in="query", @OA\Schema(type="string"), required=false, description="是否元和已投企业0否1是"), + * @OA\Parameter(name="is_company_market", in="query", @OA\Schema(type="string"), required=false, description="是否上市公司0否1是"), + * @OA\Parameter(name="company_tag", in="query", @OA\Schema(type="string"), required=false, description="企业标签"), * @OA\Parameter(name="talent_tags", in="query", @OA\Schema(type="string"), required=false, description="人才标签，多个英文逗号分隔"), * @OA\Parameter(name="token", in="query", @OA\Schema(type="string"), required=true, description="token"), * @OA\Response( @@ -210,10 +211,10 @@ class UserController extends BaseController 'company' ) ->with([ - 'courseSigns' => function ($query) { - $query->with('course.typeDetail')->orderBy('fee_status', 'desc'); - } - ])->withCount([ + 'courseSigns' => function ($query) { + $query->with('course.typeDetail')->orderBy('fee_status', 'desc'); + } + ])->withCount([ 'appointments' => function ($query) { $query->whereIn('status', [0, 1]); } @@ -228,6 +229,16 @@ class UserController extends BaseController } }); } + // 是否上市公司 + if (isset($all['is_company_market'])) { + $list = $list->whereHas('company', function ($query) use ($all) { + if ($all['is_company_market'] == 1) { + $query->where('company_market', 1); + } else { + $query->where('company_market', 0); + } + }); + } // company_tag等价于company_type，新旧数据兼容 if (isset($all['company_type'])) { $all['company_tag'] = $all['company_type'];