From 5e920486cfd9e3cc01a6dd2a9057ca934df665c5 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Thu, 15 Jan 2026 13:41:28 +0800
Subject: [PATCH] update

---
 .../Controllers/Admin/OtherController.php     | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php
index acbf13c..8d981a6 100755
--- a/app/Http/Controllers/Admin/OtherController.php
+++ b/app/Http/Controllers/Admin/OtherController.php
@@ -746,6 +746,8 @@ class OtherController extends CommonController
                             'user_name' => '',
                             'course_name' => '',
                             'course_type' => '',
+                            'course_types' => '',
+                            'course_count' => 0,
                         ]);
                     } else {
                         // 每个学员一行，多个课程合并显示
@@ -766,12 +768,25 @@ class OtherController extends CommonController
                             }
                             $courseDisplay = implode("\r\n", $courseList);
 
+                            // 获取课程体系列表，用中文顿号分隔
+                            $courseTypes = collect($courses)
+                                ->pluck('course_type')
+                                ->filter()
+                                ->unique()
+                                ->values()
+                                ->implode('、');
+
+                            // 报名课程数
+                            $courseCount = count($courses);
+
                             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 {
@@ -787,6 +802,8 @@ class OtherController extends CommonController
                                     'company_tag' => '',
                                     'user_name' => $userInfo['user_name'] ?? '',
                                     'course_name' => $courseDisplay,
+                                    'course_types' => $courseTypes,
+                                    'course_count' => $courseCount,
                                 ];
                             }
                         }
@@ -803,6 +820,8 @@ class OtherController extends CommonController
                     'company_tag' => '企业资质',
                     'user_name' => '学员姓名',
                     'course_name' => '课程信息',
+                    'course_types' => '课程体系',
+                    'course_count' => '报名课程数',
                 ];
                 $filename = '上市公司明细';
                 break;