diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php index 9b5b557..4b0e4ef 100755 --- a/app/Http/Controllers/Admin/OtherController.php +++ b/app/Http/Controllers/Admin/OtherController.php @@ -311,7 +311,7 @@ class OtherController extends CommonController $course_ids = $courses->pluck('id'); // 上市公司数（所有上市公司） - $list['company_market_total'] = CourseSign::shangshi($start_date, $end_date, $course_ids); + $list['company_market_total'] = StockCompany::count(); // 跟班学员数（在指定时间范围内报名的学员中，from为'跟班学员'的数量） $list['ganbu_total'] = CourseSign::genban($start_date, $end_date, $course_ids); @@ -802,94 +802,108 @@ class OtherController extends CommonController break; case 'company_market_total': - // 上市公司明细 - 所有上市公司，关联学员、课程信息 - // 数据结构：主表是公司，子数据是学员信息 - // 导出时：公司信息只在第一行显示，后续行公司信息为空 - $companiesData = CourseSign::shangshi($start_date, $end_date, $course_ids->toArray(), true); + // 上市公司明细 - 从stock_companys表获取所有上市公司，与coursesHome统计逻辑保持一致 + $stockCompanies = StockCompany::with('company')->get(); - foreach ($companiesData as $item) { - $company = $item['company']; - $users = $item['users'] ?? []; + foreach ($stockCompanies as $stockCompany) { + // 通过company_id关联到Company表获取详细信息 + $company = $stockCompany->company_id ? $stockCompany->company : null; + if (!$company) { + // 如果没有company_id，尝试通过公司名称关联 + $company = Company::where('company_name', $stockCompany->company_name)->first(); + } // 公司基本信息（只在第一行使用） $companyInfo = [ - 'company_name' => $company->company_name, + 'company_name' => $stockCompany->company_name, 'company_legal_representative' => $company->company_legal_representative ?? '', 'company_date' => $company->company_date ?? '', - 'stock_date' => $company->stock_date ?? '', + 'stock_date' => $stockCompany->stock_date ?? '', + 'is_after_enrollment' => $stockCompany->is_after_enrollment == 1 ? '是' : '否', 'company_address' => $company->company_address ?? '', 'company_city' => $company->company_city ?? '', 'company_area' => $company->company_area ?? '', 'company_tag' => $company->company_tag ?? '', ]; - if (empty($users)) { - // 如果没有学员报名记录，仍然导出公司基本信息 - $data[] = array_merge($companyInfo, [ - 'user_name' => '', - 'course_name' => '', - 'course_type' => '', - 'course_types' => '', - 'course_count' => 0, - ]); - } else { - // 每个学员一行，多个课程合并显示 - $isFirstRow = true; - foreach ($users as $userInfo) { - $courses = $userInfo['courses'] ?? []; - - // 合并同一学员的多个课程：格式为"课程体系-课程名称，课程体系-课程名称" - $courseList = []; - foreach ($courses as $courseInfo) { - $courseType = $courseInfo['course_type'] ?? ''; - $courseName = $courseInfo['course_name'] ?? ''; - if ($courseType && $courseName) { - $courseList[] = $courseType . '-' . $courseName; - } elseif ($courseName) { - $courseList[] = $courseName; + // 获取该公司的学员信息 + if ($company) { + $users = $company->users() + ->whereHas('courseSigns', function ($q) { + $q->where('status', 1); + }) + ->with([ + 'courseSigns' => function ($query) { + $query->where('status', 1) + ->with(['course.typeDetail']); } - } - $courseDisplay = implode("\r\n", $courseList); + ]) + ->get(); - // 获取课程体系列表，用中文顿号分隔 - $courseTypes = collect($courses) - ->pluck('course_type') - ->filter() - ->unique() - ->values() - ->implode('、'); + if ($users->isEmpty()) { + // 如果没有学员，仍然导出公司基本信息 + $data[] = array_merge($companyInfo, [ + 'user_name' => '', + 'course_names' => '', + 'course_types' => '', + 'course_count' => 0, + ]); + } else { + // 每个学员一行 + $isFirstRow = true; + foreach ($users as $user) { + $courseSigns = $user->courseSigns ?? collect([]); - // 报名课程数 - $courseCount = count($courses); + // 获取课程名称列表，用中文顿号分隔 + $courseNames = $courseSigns->pluck('course.name')->filter()->unique()->values()->implode('、'); - if ($isFirstRow) { - // 第一行：显示公司信息 - $data[] = array_merge($companyInfo, [ - 'user_name' => $userInfo['user_name'] ?? '', - 'course_name' => $courseDisplay, - 'course_type' => '', // 课程类型已合并到课程名称中 - 'course_types' => $courseTypes, - 'course_count' => $courseCount, - ]); - $isFirstRow = false; - } else { - // 后续行：公司信息为空 - $data[] = [ - 'company_name' => '', - 'company_legal_representative' => '', - 'company_date' => '', - 'stock_date' => '', - 'company_address' => '', - 'company_city' => '', - 'company_area' => '', - 'company_tag' => '', - 'user_name' => $userInfo['user_name'] ?? '', - 'course_name' => $courseDisplay, - 'course_types' => $courseTypes, - 'course_count' => $courseCount, - ]; + // 获取课程体系列表，用中文顿号分隔 + $courseTypes = $courseSigns->pluck('course.typeDetail.name') + ->filter() + ->unique() + ->values() + ->implode('、'); + + // 报名课程数 + $courseCount = $courseSigns->count(); + + if ($isFirstRow) { + // 第一行：显示公司信息 + $data[] = array_merge($companyInfo, [ + 'user_name' => $user->name ?? '', + 'course_names' => $courseNames, + 'course_types' => $courseTypes, + 'course_count' => $courseCount, + ]); + $isFirstRow = false; + } else { + // 后续行：公司信息为空 + $data[] = [ + 'company_name' => '', + 'company_legal_representative' => '', + 'company_date' => '', + 'stock_date' => '', + 'is_after_enrollment' => '', + 'company_address' => '', + 'company_city' => '', + 'company_area' => '', + 'company_tag' => '', + 'user_name' => $user->name ?? '', + 'course_names' => $courseNames, + 'course_types' => $courseTypes, + 'course_count' => $courseCount, + ]; + } } } + } else { + // 如果没有关联的公司，只导出基本信息 + $data[] = array_merge($companyInfo, [ + 'user_name' => '', + 'course_names' => '', + 'course_types' => '', + 'course_count' => 0, + ]); } } $fields = [ @@ -897,12 +911,13 @@ class OtherController extends CommonController 'company_legal_representative' => '法人', 'company_date' => '成立时间', 'stock_date' => '上市日期', + 'is_after_enrollment' => '是否入学后上市', 'company_address' => '地址', 'company_city' => '所在城市', 'company_area' => '所在区域', 'company_tag' => '企业资质', 'user_name' => '学员姓名', - 'course_name' => '课程信息', + 'course_names' => '课程名称', 'course_types' => '课程体系', 'course_count' => '报名课程数', ];