From 242de1107d5e8d238bf19f96256d6d4d269f22e1 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Fri, 28 Nov 2025 13:21:32 +0800
Subject: [PATCH] update

---
 .../Controllers/Admin/OtherController.php     | 94 ++++++++++++-------
 1 file changed, 61 insertions(+), 33 deletions(-)

diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php
index f4bdbab..49c6472 100755
--- a/app/Http/Controllers/Admin/OtherController.php
+++ b/app/Http/Controllers/Admin/OtherController.php
@@ -566,60 +566,88 @@ class OtherController extends CommonController
             case 'company_market_total':
                 // 上市公司明细 - 所有上市公司，关联学员、课程信息
                 // 数据结构：主表是公司，子数据是学员信息
+                // 导出时：公司信息只在第一行显示，后续行公司信息为空
                 $companiesData = CourseSign::shangshi($start_date, $end_date, $course_ids->toArray(), true);
 
                 foreach ($companiesData as $item) {
                     $company = $item['company'];
                     $users = $item['users'] ?? [];
 
+                    // 公司基本信息（只在第一行使用）
+                    $companyInfo = [
+                        'company_name' => $company->company_name,
+                        'company_legal_representative' => $company->company_legal_representative ?? '',
+                        'company_date' => $company->company_date ?? '',
+                        'stock_date' => $company->stock_date ?? '',
+                        'company_address' => $company->company_address ?? '',
+                        'company_city' => $company->company_city ?? '',
+                        'company_area' => $company->company_area ?? '',
+                    ];
+
                     if (empty($users)) {
                         // 如果没有学员报名记录，仍然导出公司基本信息
-                        $data[] = [
-                            'company_name' => $company->company_name,
-                            'company_legal_representative' => $company->company_legal_representative ?? '',
-                            'company_date' => $company->company_date ?? '',
-                            'stock_date' => $company->stock_date ?? '',
-                            'company_address' => $company->company_address ?? '',
-                            'company_city' => $company->company_city ?? '',
-                            'company_area' => $company->company_area ?? '',
+                        $data[] = array_merge($companyInfo, [
                             'user_name' => '',
                             'course_name' => '',
                             'course_type' => '',
-                        ];
+                        ]);
                     } else {
                         // 每个学员的每个课程组合一行
+                        $isFirstRow = true;
                         foreach ($users as $userInfo) {
                             $courses = $userInfo['courses'] ?? [];
                             if (empty($courses)) {
                                 // 如果学员没有课程，仍然导出学员基本信息
-                                $data[] = [
-                                    'company_name' => $company->company_name,
-                                    'company_legal_representative' => $company->company_legal_representative ?? '',
-                                    'company_date' => $company->company_date ?? '',
-                                    'stock_date' => $company->stock_date ?? '',
-                                    'company_address' => $company->company_address ?? '',
-                                    'company_city' => $company->company_city ?? '',
-                                    'company_area' => $company->company_area ?? '',
-                                    'user_name' => $userInfo['user_name'] ?? '',
-                                    'course_name' => '',
-                                    'course_type' => '',
-                                ];
-                            } else {
-                                // 每个课程一行
-                                foreach ($courses as $courseInfo) {
+                                if ($isFirstRow) {
+                                    // 第一行：显示公司信息
+                                    $data[] = array_merge($companyInfo, [
+                                        'user_name' => $userInfo['user_name'] ?? '',
+                                        'course_name' => '',
+                                        'course_type' => '',
+                                    ]);
+                                    $isFirstRow = false;
+                                } else {
+                                    // 后续行：公司信息为空
                                     $data[] = [
-                                        'company_name' => $company->company_name,
-                                        'company_legal_representative' => $company->company_legal_representative ?? '',
-                                        'company_date' => $company->company_date ?? '',
-                                        'stock_date' => $company->stock_date ?? '',
-                                        'company_address' => $company->company_address ?? '',
-                                        'company_city' => $company->company_city ?? '',
-                                        'company_area' => $company->company_area ?? '',
+                                        'company_name' => '',
+                                        'company_legal_representative' => '',
+                                        'company_date' => '',
+                                        'stock_date' => '',
+                                        'company_address' => '',
+                                        'company_city' => '',
+                                        'company_area' => '',
                                         'user_name' => $userInfo['user_name'] ?? '',
-                                        'course_name' => $courseInfo['course_name'] ?? '',
-                                        'course_type' => $courseInfo['course_type'] ?? '',
+                                        'course_name' => '',
+                                        'course_type' => '',
                                     ];
                                 }
+                            } else {
+                                // 每个课程一行
+                                foreach ($courses as $courseIndex => $courseInfo) {
+                                    if ($isFirstRow && $courseIndex === 0) {
+                                        // 第一行：显示公司信息
+                                        $data[] = array_merge($companyInfo, [
+                                            'user_name' => $userInfo['user_name'] ?? '',
+                                            'course_name' => $courseInfo['course_name'] ?? '',
+                                            'course_type' => $courseInfo['course_type'] ?? '',
+                                        ]);
+                                        $isFirstRow = false;
+                                    } else {
+                                        // 后续行：公司信息为空
+                                        $data[] = [
+                                            'company_name' => '',
+                                            'company_legal_representative' => '',
+                                            'company_date' => '',
+                                            'stock_date' => '',
+                                            'company_address' => '',
+                                            'company_city' => '',
+                                            'company_area' => '',
+                                            'user_name' => $userInfo['user_name'] ?? '',
+                                            'course_name' => $courseInfo['course_name'] ?? '',
+                                            'course_type' => $courseInfo['course_type'] ?? '',
+                                        ];
+                                    }
+                                }
                             }
                         }
                     }