From f0b34c7d9fab42509e06341ad5f618d0eb6e60f6 Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Thu, 15 Jan 2026 13:47:43 +0800 Subject: [PATCH 1/3] update --- .../Controllers/Admin/OtherController.php | 95 ++++--------------- 1 file changed, 19 insertions(+), 76 deletions(-) diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php index 8d981a6..a2dd62c 100755 --- a/app/Http/Controllers/Admin/OtherController.php +++ b/app/Http/Controllers/Admin/OtherController.php @@ -894,78 +894,24 @@ class OtherController extends CommonController break; case 'company_market_year_total': - // 今年上市公司明细 - 所有今年上市公司，关联学员、课程信息 - // 数据结构：主表是公司，子数据是学员信息 - // 导出时：公司信息只在第一行显示，后续行公司信息为空 - $companiesData = CourseSign::companyMarketYear($start_date, $end_date, $course_ids->toArray(), true); + // 今年上市公司明细 - 从stock_companys表获取，与coursesHome统计逻辑保持一致 + $currentYear = date('Y'); + $stockCompanies = StockCompany::whereYear('stock_date', $currentYear)->get(); - foreach ($companiesData as $item) { - $company = $item['company']; - $users = $item['users'] ?? []; + foreach ($stockCompanies as $stockCompany) { + // 通过公司名称关联到Company表获取详细信息 + $company = Company::where('company_name', $stockCompany->company_name)->first(); - // 公司基本信息（只在第一行使用） - $companyInfo = [ - 'company_name' => $company->company_name, + $data[] = [ + '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 ?? '', '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' => '', - ]); - } 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; - } - } - $courseDisplay = implode("\r\n", $courseList); - - if ($isFirstRow) { - // 第一行：显示公司信息 - $data[] = array_merge($companyInfo, [ - 'user_name' => $userInfo['user_name'] ?? '', - 'course_name' => $courseDisplay, - 'course_type' => '', // 课程类型已合并到课程名称中 - ]); - $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, - ]; - } - } - } } $fields = [ 'company_name' => '企业名称', @@ -976,26 +922,24 @@ class OtherController extends CommonController 'company_city' => '所在城市', 'company_area' => '所在区域', 'company_tag' => '企业资质', - 'user_name' => '学员姓名', - 'course_name' => '课程信息', ]; $filename = '今年上市公司明细'; break; case 'company_market_after_enrollment_total': - // 入学后上市公司明细 - 使用模型方法 - $companiesAfterEnrollment = CourseSign::companyMarketAfterEnrollment($start_date, $end_date, $course_ids, true); + // 入学后上市公司明细 - 从stock_companys表获取，与coursesHome统计逻辑保持一致 + $stockCompanies = StockCompany::where('is_after_enrollment', 1)->get(); + + foreach ($stockCompanies as $stockCompany) { + // 通过公司名称关联到Company表获取详细信息 + $company = Company::where('company_name', $stockCompany->company_name)->first(); - foreach ($companiesAfterEnrollment as $item) { - $company = $item['company']; - $userNames = collect($item['users'])->pluck('name')->filter()->unique()->implode("\n\r"); $data[] = [ - '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 ?? '', - 'first_sign_date' => $item['first_sign_date'], - 'user_names' => $userNames, + 'stock_date' => $stockCompany->stock_date ?? '', + 'enrollment_date' => $stockCompany->enrollment_date ?? '', 'company_address' => $company->company_address ?? '', 'company_city' => $company->company_city ?? '', ]; @@ -1005,8 +949,7 @@ class OtherController extends CommonController 'company_legal_representative' => '法人', 'company_date' => '成立时间', 'stock_date' => '上市日期', - 'first_sign_date' => '首次报名时间', - 'user_names' => '学员姓名', + 'enrollment_date' => '入学时间', 'company_address' => '地址', 'company_city' => '所在城市', ]; From f3f5c94212f691a8eb1b6c9d45b12d37691b1834 Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Thu, 15 Jan 2026 13:58:06 +0800 Subject: [PATCH 2/3] update --- ...add_company_id_to_stock_companys_table.php | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 database/migrations/2026_01_15_135416_add_company_id_to_stock_companys_table.php diff --git a/database/migrations/2026_01_15_135416_add_company_id_to_stock_companys_table.php b/database/migrations/2026_01_15_135416_add_company_id_to_stock_companys_table.php new file mode 100644 index 0000000..f226c21 --- /dev/null +++ b/database/migrations/2026_01_15_135416_add_company_id_to_stock_companys_table.php @@ -0,0 +1,32 @@ +unsignedBigInteger('company_id')->nullable()->after('company_name')->comment('公司ID'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('stock_companys', function (Blueprint $table) { + $table->dropColumn('company_id'); + }); + } +}; From 486a6e4ac0738af64fe04f87a0e087b6b25aefea Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Thu, 15 Jan 2026 14:02:41 +0800 Subject: [PATCH 3/3] update --- .../Controllers/Admin/OtherController.php | 205 +++++++++++++++++- app/Models/StockCompany.php | 8 + ...add_company_id_to_stock_companys_table.php | 3 +- 3 files changed, 202 insertions(+), 14 deletions(-) diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php index a2dd62c..ba62b16 100755 --- a/app/Http/Controllers/Admin/OtherController.php +++ b/app/Http/Controllers/Admin/OtherController.php @@ -896,62 +896,243 @@ class OtherController extends CommonController case 'company_market_year_total': // 今年上市公司明细 - 从stock_companys表获取，与coursesHome统计逻辑保持一致 $currentYear = date('Y'); - $stockCompanies = StockCompany::whereYear('stock_date', $currentYear)->get(); + $stockCompanies = StockCompany::with('company')->whereYear('stock_date', $currentYear)->get(); foreach ($stockCompanies as $stockCompany) { - // 通过公司名称关联到Company表获取详细信息 - $company = Company::where('company_name', $stockCompany->company_name)->first(); + // 通过company_id关联到Company表获取详细信息 + $company = $stockCompany->company_id ? $stockCompany->company : null; + if (!$company) { + // 如果没有company_id，尝试通过公司名称关联 + $company = Company::where('company_name', $stockCompany->company_name)->first(); + } - $data[] = [ + // 公司基本信息（只在第一行使用） + $companyInfo = [ 'company_name' => $stockCompany->company_name, 'company_legal_representative' => $company->company_legal_representative ?? '', - 'company_date' => $company->company_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 ($company) { + $users = $company->users() + ->whereHas('courseSigns', function ($q) { + $q->where('status', 1); + }) + ->with([ + 'courseSigns' => function ($query) { + $query->where('status', 1) + ->with(['course.typeDetail']); + } + ]) + ->get(); + + 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([]); + + // 获取课程名称列表，用中文顿号分隔 + $courseNames = $courseSigns->pluck('course.name')->filter()->unique()->values()->implode('、'); + + // 获取课程体系列表，用中文顿号分隔 + $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' => '', + '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 = [ 'company_name' => '企业名称', 'company_legal_representative' => '法人', - 'company_date' => '成立时间', 'stock_date' => '上市日期', + 'is_after_enrollment' => '是否入学后上市', 'company_address' => '地址', 'company_city' => '所在城市', 'company_area' => '所在区域', 'company_tag' => '企业资质', + 'user_name' => '学员姓名', + 'course_names' => '课程名称', + 'course_types' => '课程体系', + 'course_count' => '报名课程数', ]; $filename = '今年上市公司明细'; break; case 'company_market_after_enrollment_total': // 入学后上市公司明细 - 从stock_companys表获取，与coursesHome统计逻辑保持一致 - $stockCompanies = StockCompany::where('is_after_enrollment', 1)->get(); + $stockCompanies = StockCompany::with('company')->where('is_after_enrollment', 1)->get(); foreach ($stockCompanies as $stockCompany) { - // 通过公司名称关联到Company表获取详细信息 - $company = Company::where('company_name', $stockCompany->company_name)->first(); + // 通过company_id关联到Company表获取详细信息 + $company = $stockCompany->company_id ? $stockCompany->company : null; + if (!$company) { + // 如果没有company_id，尝试通过公司名称关联 + $company = Company::where('company_name', $stockCompany->company_name)->first(); + } - $data[] = [ + // 公司基本信息（只在第一行使用） + $companyInfo = [ 'company_name' => $stockCompany->company_name, 'company_legal_representative' => $company->company_legal_representative ?? '', - 'company_date' => $company->company_date ?? '', 'stock_date' => $stockCompany->stock_date ?? '', 'enrollment_date' => $stockCompany->enrollment_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 ($company) { + $users = $company->users() + ->whereHas('courseSigns', function ($q) { + $q->where('status', 1); + }) + ->with([ + 'courseSigns' => function ($query) { + $query->where('status', 1) + ->with(['course.typeDetail']); + } + ]) + ->get(); + + 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([]); + + // 获取课程名称列表，用中文顿号分隔 + $courseNames = $courseSigns->pluck('course.name')->filter()->unique()->values()->implode('、'); + + // 获取课程体系列表，用中文顿号分隔 + $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' => '', + 'stock_date' => '', + 'enrollment_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 = [ 'company_name' => '企业名称', 'company_legal_representative' => '法人', - 'company_date' => '成立时间', 'stock_date' => '上市日期', 'enrollment_date' => '入学时间', + 'is_after_enrollment' => '是否入学后上市', 'company_address' => '地址', 'company_city' => '所在城市', + 'company_area' => '所在区域', + 'company_tag' => '企业资质', + 'user_name' => '学员姓名', + 'course_names' => '课程名称', + 'course_types' => '课程体系', + 'course_count' => '报名课程数', ]; $filename = '入学后上市公司明细'; break; diff --git a/app/Models/StockCompany.php b/app/Models/StockCompany.php index 44d6ed8..e114974 100644 --- a/app/Models/StockCompany.php +++ b/app/Models/StockCompany.php @@ -19,5 +19,13 @@ class StockCompany extends SoftDeletesModel ]; return $array[$this->is_after_enrollment] ?? '否'; } + + /** + * 关联公司 + */ + public function company() + { + return $this->belongsTo(Company::class, 'company_id', 'id'); + } } diff --git a/database/migrations/2026_01_15_135416_add_company_id_to_stock_companys_table.php b/database/migrations/2026_01_15_135416_add_company_id_to_stock_companys_table.php index f226c21..a792c0e 100644 --- a/database/migrations/2026_01_15_135416_add_company_id_to_stock_companys_table.php +++ b/database/migrations/2026_01_15_135416_add_company_id_to_stock_companys_table.php @@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -return new class extends Migration -{ +return new class extends Migration { /** * Run the migrations. *