From d6a0bdf183751ec70511315fd587f46c296b0635 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Fri, 21 Nov 2025 17:45:51 +0800
Subject: [PATCH] update

---
 .../Controllers/Admin/OtherController.php     | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php
index b6685f1..e079fb2 100755
--- a/app/Http/Controllers/Admin/OtherController.php
+++ b/app/Http/Controllers/Admin/OtherController.php
@@ -465,19 +465,28 @@ class OtherController extends CommonController
                 break;
 
             case 'areas':
-                // 区域明细 - 与coursesHome中的areas逻辑保持一致
-                $areas = ParameterDetail::where('parameter_id', 5)->get();
-                foreach ($areas as $area) {
+                // 区域明细 - 导出course_signs_pass列表数据，附加区域信息
+                $courseSigns = CourseSign::courseSignsTotal($start_date, $end_date, 1, $course_ids, null, true);
+                // 加载关联关系
+                $courseSigns->load(['user', 'course']);
+
+                foreach ($courseSigns as $sign) {
                     $data[] = [
-                        'area_name' => $area->value,
-                        'course_signs_pass' => CourseSign::courseSignsTotal($start_date, $end_date, 1, $course_ids, $area->value),
-                        'course_signs_pass_unique' => CourseSign::courseSignsTotalByUnique($start_date, $end_date, 1, $course_ids, $area->value),
+                        'area_name' => $sign->user->company_area ?? '',
+                        'user_name' => $sign->user->name ?? '',
+                        'mobile' => $sign->user->mobile ?? '',
+                        'company_name' => $sign->user->company_name ?? '',
+                        'course_name' => $sign->course->name ?? '',
+                        'created_at' => $sign->created_at ? $sign->created_at->format('Y-m-d H:i:s') : '',
                     ];
                 }
                 $fields = [
                     'area_name' => '区域名称',
-                    'course_signs_pass' => '培养人数',
-                    'course_signs_pass_unique' => '去重培养人数',
+                    'user_name' => '学员姓名',
+                    'mobile' => '手机号',
+                    'company_name' => '企业名称',
+                    'course_name' => '课程名称',
+                    'created_at' => '报名时间',
                 ];
                 $filename = '区域明细';
                 break;