update

app/Http/Controllers/Admin/OtherController.php

@@ -520,14 +520,27 @@ class OtherController extends CommonController
                         })
                         ->whereNotIn('status', [4, 5, 6])
                         ->where('user_id', $user->id)
-                        ->with('course')
+                        ->with(['course.typeDetail'])
                         ->get();
-                    $courseNames = $userCourseSigns->pluck('course.name')->filter()->unique()->implode("\n\r");
 
-                    // 优先使用 company 关系的企业信息，如果不存在则使用 User 表的 company_name 字段
-                    $companyName = $user->company && $user->company->company_name
+                    // 获取课程名称列表，用中文顿号分隔
+                    $courseNames = $userCourseSigns->pluck('course.name')->filter()->unique()->values()->implode('、');
+
+                    // 获取课程体系列表，用中文顿号分隔
+                    $courseTypes = $userCourseSigns->pluck('course.typeDetail.name')
+                        ->filter()
+                        ->unique()
+                        ->values()
+                        ->implode('、');
+
+                    // 企查查企业（来自 company 表）
+                    $qccCompanyName = $user->company && $user->company->company_name
                         ? $user->company->company_name
-                        : ($user->company_name ?? '');
+                        : '';
+                    // 用户填写企业（来自 user 表）
+                    $userCompanyName = $user->company_name ?? '';
+
+                    // 优先使用 company 关系的企业信息，如果不存在则使用 User 表的字段
                     $companyArea = $user->company && $user->company->company_area
                         ? $user->company->company_area
                         : ($user->company_area ?? '');
@@ -538,9 +551,12 @@ class OtherController extends CommonController
                     $data[] = [
                         'user_name' => $user->name ?? '',
                         'mobile' => $user->mobile ?? '',
-                        'company_name' => $companyName,
+                        'qcc_company_name' => $qccCompanyName,
+                        'user_company_name' => $userCompanyName,
+                        'company_position' => $user->company_position ?? '',
                         'company_area' => $companyArea,
                         'company_industry' => $companyIndustry,
+                        'course_types' => $courseTypes,
                         'course_names' => $courseNames,
                         'course_count' => $userCourseSigns->count(),
                     ];
@@ -548,9 +564,12 @@ class OtherController extends CommonController
                 $fields = [
                     'user_name' => '学员姓名',
                     'mobile' => '手机号',
-                    'company_name' => '企业名称',
+                    'qcc_company_name' => '企查查企业',
+                    'user_company_name' => '用户填写企业',
+                    'company_position' => '职务',
                     'company_area' => '所在区域',
                     'company_industry' => '所属行业',
+                    'course_types' => '课程体系',
                     'course_names' => '报名课程',
                     'course_count' => '报名课程数',
                 ];