From bca9999e2c673ecc60d3b5e94f3bc077d2706180 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 10:18:18 +0800
Subject: [PATCH 01/20] update

---
 app/Http/Controllers/Admin/OtherController.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php
index 83dbbf8..0664029 100755
--- a/app/Http/Controllers/Admin/OtherController.php
+++ b/app/Http/Controllers/Admin/OtherController.php
@@ -329,6 +329,9 @@ class OtherController extends CommonController
                         'company_address' => $company->company_address ?? '',
                         'business_scope' => $company->business_scope ?? '',
                         'contact_phone' => $company->contact_phone ?? '',
+                        'contact_mail' => $company->contact_mail ?? '',
+                        'company_tag' => $company->company_tag ?? '',
+                        'credit_code' => $company->credit_code ?? '',
                     ];
                 }
                 $fields = [
@@ -338,6 +341,9 @@ class OtherController extends CommonController
                     'company_address' => '地址',
                     'business_scope' => '营业范围',
                     'contact_phone' => '联系电话',
+                    'contact_mail' => '联系邮箱',
+                    'company_tag' => '企业资质',
+                    'credit_code' => '统一社会信用代码',
                 ];
                 $filename = '被投企业明细';
                 break;
@@ -384,7 +390,7 @@ class OtherController extends CommonController
                         'company_name' => $sign->user->company_name ?? '',
                         'company_area' => $sign->user->company_area ?? '',
                         'course_name' => $sign->course->name ?? '',
-                        'created_at' => $sign->created_at ? $sign->created_at->format('Y-m-d H:i:s') : '',
+                        // 'created_at' => $sign->created_at ? $sign->created_at->format('Y-m-d H:i:s') : '',
                     ];
                 }
                 $fields = [
@@ -393,7 +399,7 @@ class OtherController extends CommonController
                     'company_name' => '企业名称',
                     'company_area' => '所在区域',
                     'course_name' => '课程名称',
-                    'created_at' => '报名时间',
+                    // 'created_at' => '报名时间',
                 ];
                 $filename = '审核通过人数明细';
                 break;

From 1fbce489c77caaa2a8d1d707ab650053a689e407 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 10:22:47 +0800
Subject: [PATCH 02/20] update

---
 app/Http/Controllers/Admin/OtherController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php
index 0664029..e7c890a 100755
--- a/app/Http/Controllers/Admin/OtherController.php
+++ b/app/Http/Controllers/Admin/OtherController.php
@@ -331,7 +331,7 @@ class OtherController extends CommonController
                         'contact_phone' => $company->contact_phone ?? '',
                         'contact_mail' => $company->contact_mail ?? '',
                         'company_tag' => $company->company_tag ?? '',
-                        'credit_code' => $company->credit_code ?? '',
+                        'credit_code' => ' '.$company->credit_code ?? '',
                     ];
                 }
                 $fields = [

From 4bbb3872a5cfd024463df6654d90aa9cdb658d6a Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 10:28:19 +0800
Subject: [PATCH 03/20] update

---
 app/Http/Controllers/Admin/OtherController.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php
index e7c890a..9798a43 100755
--- a/app/Http/Controllers/Admin/OtherController.php
+++ b/app/Http/Controllers/Admin/OtherController.php
@@ -331,7 +331,7 @@ class OtherController extends CommonController
                         'contact_phone' => $company->contact_phone ?? '',
                         'contact_mail' => $company->contact_mail ?? '',
                         'company_tag' => $company->company_tag ?? '',
-                        'credit_code' => ' '.$company->credit_code ?? '',
+                        'credit_code' => ' ' . $company->credit_code ?? '',
                     ];
                 }
                 $fields = [
@@ -411,9 +411,11 @@ class OtherController extends CommonController
                 foreach ($users as $user) {
                     // 获取该学员报名的课程列表（与coursesHome逻辑保持一致）
                     $userCourseSigns = CourseSign::where('user_id', $user->id)
-                        ->whereDate('created_at', '>=', $start_date)
-                        ->whereDate('created_at', '<=', $end_date)
-                        ->where('status', 1)
+                        ->whereHas('course', function ($query) use ($start_date, $end_date) {
+                            // 开始结束日期的筛选。or查询
+                            $query->whereBetween('start_date', [$start_date, $end_date])
+                                ->whereBetween('end_date', [$start_date, $end_date]);
+                        })->where('status', 1)
                         ->where(function ($query) use ($course_ids) {
                             if ($course_ids->isNotEmpty()) {
                                 $query->whereIn('course_id', $course_ids);

From 4d2387051c6eb7dc3b6b5ed1cb870a2375b2bbef Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 10:31:26 +0800
Subject: [PATCH 04/20] update

---
 app/Http/Controllers/Admin/OtherController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php
index 9798a43..a4a2364 100755
--- a/app/Http/Controllers/Admin/OtherController.php
+++ b/app/Http/Controllers/Admin/OtherController.php
@@ -423,7 +423,7 @@ class OtherController extends CommonController
                         })->whereNotIn('status', [4, 5])
                         ->with('course')
                         ->get();
-                    $courseNames = $userCourseSigns->pluck('course.name')->filter()->unique()->implode('、');
+                    $courseNames = $userCourseSigns->pluck('course.name')->filter()->unique()->implode("\n\r");
 
                     $data[] = [
                         'user_name' => $user->name ?? '',

From 3f0f4607aa20ad74fc1f8ba507f72214d4b1f8cd Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 10:32:46 +0800
Subject: [PATCH 05/20] update

---
 app/Http/Controllers/Admin/OtherController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php
index a4a2364..e46df39 100755
--- a/app/Http/Controllers/Admin/OtherController.php
+++ b/app/Http/Controllers/Admin/OtherController.php
@@ -407,7 +407,7 @@ class OtherController extends CommonController
             case 'course_signs_pass_unique':
                 // 审核通过人数去重明细 - 使用courseSignsTotalByUnique方法获取列表
                 $users = CourseSign::courseSignsTotalByUnique($start_date, $end_date, 1, $course_ids, null, true);
-
+                dd($users->count());
                 foreach ($users as $user) {
                     // 获取该学员报名的课程列表（与coursesHome逻辑保持一致）
                     $userCourseSigns = CourseSign::where('user_id', $user->id)

From 46c19f828912fbc9c7626b3dc192e30bfd996e3c Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 10:35:13 +0800
Subject: [PATCH 06/20] update

---
 app/Http/Controllers/Admin/OtherController.php | 1 -
 app/Models/CourseSign.php                      | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php
index e46df39..711a285 100755
--- a/app/Http/Controllers/Admin/OtherController.php
+++ b/app/Http/Controllers/Admin/OtherController.php
@@ -407,7 +407,6 @@ class OtherController extends CommonController
             case 'course_signs_pass_unique':
                 // 审核通过人数去重明细 - 使用courseSignsTotalByUnique方法获取列表
                 $users = CourseSign::courseSignsTotalByUnique($start_date, $end_date, 1, $course_ids, null, true);
-                dd($users->count());
                 foreach ($users as $user) {
                     // 获取该学员报名的课程列表（与coursesHome逻辑保持一致）
                     $userCourseSigns = CourseSign::where('user_id', $user->id)
diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php
index c86ca1c..4aebf59 100755
--- a/app/Models/CourseSign.php
+++ b/app/Models/CourseSign.php
@@ -139,7 +139,7 @@ class CourseSign extends SoftDeletesModel
         $user = User::whereIn('id', $courseSignByType->pluck('user_id'))->distinct('mobile');
         if ($retList) {
             // 列表
-            return $user->get();
+            return $user->groupBy('mobile')->get();
         } else {
             // 统计数据
             return $user->count();

From 6ba3fd19ae7011b06a6c6126c6785a67c9e41452 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 10:42:41 +0800
Subject: [PATCH 07/20] update

---
 app/Http/Controllers/Admin/OtherController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php
index 711a285..b9c227f 100755
--- a/app/Http/Controllers/Admin/OtherController.php
+++ b/app/Http/Controllers/Admin/OtherController.php
@@ -574,11 +574,11 @@ class OtherController extends CommonController
 
             case 'company_market_after_enrollment_total':
                 // 入学后上市公司明细 - 使用模型方法
-                $companiesAfterEnrollment = CourseSign::companyMarketAfterEnrollment($start_date, $end_date, $course_ids->toArray(), true);
+                $companiesAfterEnrollment = CourseSign::companyMarketAfterEnrollment($start_date, $end_date, $course_ids, true);
 
                 foreach ($companiesAfterEnrollment as $item) {
                     $company = $item['company'];
-                    $userNames = collect($item['users'])->pluck('name')->filter()->unique()->implode('、');
+                    $userNames = collect($item['users'])->pluck('name')->filter()->unique()->implode("\n\r");
                     $data[] = [
                         'company_name' => $company->company_name,
                         'company_legal_representative' => $company->company_legal_representative ?? '',

From e3c18074a0aa242730c0d213f1e888d5dbb40382 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 10:46:14 +0800
Subject: [PATCH 08/20] update

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

diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php
index b9c227f..57e5313 100755
--- a/app/Http/Controllers/Admin/OtherController.php
+++ b/app/Http/Controllers/Admin/OtherController.php
@@ -390,6 +390,7 @@ class OtherController extends CommonController
                         'company_name' => $sign->user->company_name ?? '',
                         'company_area' => $sign->user->company_area ?? '',
                         'course_name' => $sign->course->name ?? '',
+                        'course_type' => $sign->course->typeDetail->name ?? '',
                         // 'created_at' => $sign->created_at ? $sign->created_at->format('Y-m-d H:i:s') : '',
                     ];
                 }
@@ -399,6 +400,7 @@ class OtherController extends CommonController
                     'company_name' => '企业名称',
                     'company_area' => '所在区域',
                     'course_name' => '课程名称',
+                    'course_type' => '课程类型',
                     // 'created_at' => '报名时间',
                 ];
                 $filename = '审核通过人数明细';

From c15fcdfc9870382b58d87c5f141f2d433e2ca545 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 11:10:17 +0800
Subject: [PATCH 09/20] update

---
 .../Controllers/Admin/OtherController.php     |  6 +--
 app/Models/CourseSign.php                     | 54 +++++++++++++++++++
 2 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php
index 57e5313..129f416 100755
--- a/app/Http/Controllers/Admin/OtherController.php
+++ b/app/Http/Controllers/Admin/OtherController.php
@@ -273,11 +273,7 @@ class OtherController extends CommonController
             }
         }
         // 区域明细统计
-        $areas = ParameterDetail::where('parameter_id', 5)->get();
-        foreach ($areas as $area) {
-            $area->course_signs_pass = CourseSign::courseSignsTotal($start_date, $end_date, 1, $courses->pluck('id'), $area->value);
-            $area->course_signs_pass_unique = CourseSign::courseSignsTotalByUnique($start_date, $end_date, 1, $courses->pluck('id'), $area->value);
-        }
+        $areas = CourseSign::area($start_date, $end_date, 1, $courses->pluck('id'), true);
         return $this->success(compact('list', 'courseTypesSum', 'areas'));
     }
 
diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php
index 4aebf59..41fc52c 100755
--- a/app/Models/CourseSign.php
+++ b/app/Models/CourseSign.php
@@ -248,5 +248,59 @@ class CourseSign extends SoftDeletesModel
         }
     }
 
+    /**
+     * 区域统计
+     * @param string $start_date 开始日期
+     * @param string $end_date 结束日期
+     * @param array|null $course_ids 课程ID数组，不传则统计所有课程
+     * @param bool $retList 是否返回列表，false返回详情，true返回列表
+     */
+    public static function area($start_date, $end_date, $status = null, $course_ids = null, $retList = false)
+    {
+        // 获取所有学员id
+        $courseSignList = CourseSign::where(function ($query) use ($status, $course_ids) {
+            if (isset($status)) {
+                $query->where('status', $status);
+            }
+            if (isset($course_ids)) {
+                $query->whereIn('course_id', $course_ids);
+            }
+        })->whereHas('course', function ($query) use ($start_date, $end_date) {
+            // 开始结束日期的筛选。or查询
+            $query->whereBetween('start_date', [$start_date, $end_date])
+                ->whereBetween('end_date', [$start_date, $end_date]);
+        })->whereHas('user')->whereNotIn('status', [4, 5]);
+        // 地区
+        $suzhouArea = Company::where('company_city', '苏州市')->pluck('company_area')->unique();
+        $list = [];
+        foreach ($suzhouArea as $area) {
+            $list[] = [
+                'area' => $area,
+                'total' => $courseSignList->whereHas('user', function ($query) use ($area) {
+                    $query->whereHas('company', function ($query) use ($area) {
+                        $query->where('company_area', $area);
+                    });
+                })->count(),
+            ];
+
+        }
+        $list[] = [
+            'area' => '苏州市外',
+            'total' => $courseSignList->whereHas('user', function ($query) use ($suzhouArea) {
+                $query->whereHas('company', function ($query) use ($suzhouArea) {
+                    $query->whereNotIn('company_area', $suzhouArea);
+                });
+            })->count(),
+        ];
+
+        if ($retList) {
+            // 返回列表
+            return $list;
+        } else {
+            // 返回统计数据
+            return $courseSignList->get();
+        }
+    }
+
 }
 

From 06a1c3612412973fe7f22e8221fd0745b0c9848b Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 11:11:48 +0800
Subject: [PATCH 10/20] update

---
 app/Models/CourseSign.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php
index 41fc52c..11522f4 100755
--- a/app/Models/CourseSign.php
+++ b/app/Models/CourseSign.php
@@ -270,6 +270,7 @@ class CourseSign extends SoftDeletesModel
             $query->whereBetween('start_date', [$start_date, $end_date])
                 ->whereBetween('end_date', [$start_date, $end_date]);
         })->whereHas('user')->whereNotIn('status', [4, 5]);
+        dd($courseSignList->count());
         // 地区
         $suzhouArea = Company::where('company_city', '苏州市')->pluck('company_area')->unique();
         $list = [];

From afe8b9902710a15d18ebefe4be4b119cde617eef Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 11:13:35 +0800
Subject: [PATCH 11/20] update

---
 app/Models/CourseSign.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php
index 11522f4..541c5fa 100755
--- a/app/Models/CourseSign.php
+++ b/app/Models/CourseSign.php
@@ -270,14 +270,13 @@ class CourseSign extends SoftDeletesModel
             $query->whereBetween('start_date', [$start_date, $end_date])
                 ->whereBetween('end_date', [$start_date, $end_date]);
         })->whereHas('user')->whereNotIn('status', [4, 5]);
-        dd($courseSignList->count());
         // 地区
         $suzhouArea = Company::where('company_city', '苏州市')->pluck('company_area')->unique();
         $list = [];
         foreach ($suzhouArea as $area) {
             $list[] = [
                 'area' => $area,
-                'total' => $courseSignList->whereHas('user', function ($query) use ($area) {
+                'total' => (clone $courseSignList)->whereHas('user', function ($query) use ($area) {
                     $query->whereHas('company', function ($query) use ($area) {
                         $query->where('company_area', $area);
                     });
@@ -287,7 +286,7 @@ class CourseSign extends SoftDeletesModel
         }
         $list[] = [
             'area' => '苏州市外',
-            'total' => $courseSignList->whereHas('user', function ($query) use ($suzhouArea) {
+            'total' => (clone $courseSignList)->whereHas('user', function ($query) use ($suzhouArea) {
                 $query->whereHas('company', function ($query) use ($suzhouArea) {
                     $query->whereNotIn('company_area', $suzhouArea);
                 });

From 76d5ab86ede7cf49d775dc24fd2de412b2fc8438 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 11:16:27 +0800
Subject: [PATCH 12/20] update

---
 app/Models/CourseSign.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php
index 541c5fa..9050bd2 100755
--- a/app/Models/CourseSign.php
+++ b/app/Models/CourseSign.php
@@ -288,7 +288,7 @@ class CourseSign extends SoftDeletesModel
             'area' => '苏州市外',
             'total' => (clone $courseSignList)->whereHas('user', function ($query) use ($suzhouArea) {
                 $query->whereHas('company', function ($query) use ($suzhouArea) {
-                    $query->whereNotIn('company_area', $suzhouArea);
+                    $query->where('company_city','!=','苏州市');
                 });
             })->count(),
         ];

From 9a66bed00def879d27ef65e450357842c58d3bae Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 11:18:47 +0800
Subject: [PATCH 13/20] update

---
 app/Models/CourseSign.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php
index 9050bd2..de5fb52 100755
--- a/app/Models/CourseSign.php
+++ b/app/Models/CourseSign.php
@@ -286,9 +286,9 @@ class CourseSign extends SoftDeletesModel
         }
         $list[] = [
             'area' => '苏州市外',
-            'total' => (clone $courseSignList)->whereHas('user', function ($query) use ($suzhouArea) {
-                $query->whereHas('company', function ($query) use ($suzhouArea) {
-                    $query->where('company_city','!=','苏州市');
+            'total' => (clone $courseSignList)->whereHas('user', function ($query) {
+                $query->whereHas('company', function ($query) {
+                    $query->where('company_city', '!=', '苏州市');
                 });
             })->count(),
         ];

From a2e5d8c58f8dac5f4e9b19b9ce3b273efff245c1 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 11:23:05 +0800
Subject: [PATCH 14/20] update

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

diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php
index 129f416..2bf97ca 100755
--- a/app/Http/Controllers/Admin/OtherController.php
+++ b/app/Http/Controllers/Admin/OtherController.php
@@ -471,27 +471,31 @@ class OtherController extends CommonController
 
             case 'areas':
                 // 区域明细 - 导出course_signs_pass列表数据，附加区域信息
-                $courseSigns = CourseSign::courseSignsTotal($start_date, $end_date, 1, $course_ids, null, true);
+                $courseSigns = CourseSign::area($start_date, $end_date, 1, $courses->pluck('id'), false);
                 // 加载关联关系
-                $courseSigns->load(['user', 'course']);
+                $courseSigns->load(['user.company', 'course']);
 
                 foreach ($courseSigns as $sign) {
                     $data[] = [
-                        'area_name' => $sign->user->company_area ?? '',
+                        'company_name' => $sign->user->company->company_name ?? '',
+                        'area_name' => $sign->user->company->company_area ?? '',
+                        'company_city' => $sign->user->company->company_city ?? '',
+                        'company_province' => $sign->user->company->company_province ?? '',
                         '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') : '',
+                        //  'created_at' => $sign->created_at ? $sign->created_at->format('Y-m-d H:i:s') : '',
                     ];
                 }
                 $fields = [
-                    'area_name' => '区域名称',
+                    'company_name' => '企业名称',
+                    'company_area' => '公司区域',
+                    'company_city' => '公司城市',
+                    'company_province' => '公司省份',
                     'user_name' => '学员姓名',
                     'mobile' => '手机号',
-                    'company_name' => '企业名称',
                     'course_name' => '课程名称',
-                    'created_at' => '报名时间',
+                    //  'created_at' => '报名时间',
                 ];
                 $filename = '区域明细';
                 break;

From 1d15277d224c982bd38ab4ee1f435c4992d04af5 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 11:31:04 +0800
Subject: [PATCH 15/20] update

---
 app/Models/CourseSign.php | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php
index de5fb52..b35bde8 100755
--- a/app/Models/CourseSign.php
+++ b/app/Models/CourseSign.php
@@ -274,23 +274,31 @@ class CourseSign extends SoftDeletesModel
         $suzhouArea = Company::where('company_city', '苏州市')->pluck('company_area')->unique();
         $list = [];
         foreach ($suzhouArea as $area) {
+            $sourseSignList2 = (clone $courseSignList)->whereHas('user', function ($query) use ($area) {
+                $query->whereHas('company', function ($query) use ($area) {
+                    $query->where('company_area', $area);
+                });
+            })->get();
+
             $list[] = [
                 'area' => $area,
-                'total' => (clone $courseSignList)->whereHas('user', function ($query) use ($area) {
-                    $query->whereHas('company', function ($query) use ($area) {
-                        $query->where('company_area', $area);
-                    });
-                })->count(),
+                // 未去重
+                'total' => $sourseSignList2->count(),
+                // 已去重
+                'total_unique' => User::groupBy('mobile')->whereIn('id', $sourseSignList2->pluck('user_id'))->count(),
             ];
 
         }
+        $courseSignList3 = (clone $courseSignList)->whereHas('user', function ($query) {
+            $query->whereHas('company', function ($query) {
+                $query->where('company_city', '!=', '苏州市');
+            });
+        })->get();
         $list[] = [
             'area' => '苏州市外',
-            'total' => (clone $courseSignList)->whereHas('user', function ($query) {
-                $query->whereHas('company', function ($query) {
-                    $query->where('company_city', '!=', '苏州市');
-                });
-            })->count(),
+            'total' => $courseSignList3->count(),
+            // 已去重
+            'total_unique' => User::groupBy('mobile')->whereIn('id', $courseSignList3->pluck('user_id'))->count(),
         ];
 
         if ($retList) {

From 6b8f4e7958b4e46d24fceb13a1a7cea78be1f2b6 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 11:32:23 +0800
Subject: [PATCH 16/20] update

---
 app/Models/CourseSign.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php
index b35bde8..dd501ef 100755
--- a/app/Models/CourseSign.php
+++ b/app/Models/CourseSign.php
@@ -285,7 +285,7 @@ class CourseSign extends SoftDeletesModel
                 // 未去重
                 'total' => $sourseSignList2->count(),
                 // 已去重
-                'total_unique' => User::groupBy('mobile')->whereIn('id', $sourseSignList2->pluck('user_id'))->count(),
+                'total_unique' => User::whereIn('id', $sourseSignList2->pluck('user_id'))->count(),
             ];
 
         }

From 03a0478c11e169018b1ae6f56afac5831eed5f3d Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 11:33:09 +0800
Subject: [PATCH 17/20] update

---
 app/Models/CourseSign.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php
index dd501ef..56a679a 100755
--- a/app/Models/CourseSign.php
+++ b/app/Models/CourseSign.php
@@ -285,7 +285,7 @@ class CourseSign extends SoftDeletesModel
                 // 未去重
                 'total' => $sourseSignList2->count(),
                 // 已去重
-                'total_unique' => User::whereIn('id', $sourseSignList2->pluck('user_id'))->count(),
+                'total_unique' => User::whereIn('id', $sourseSignList2->pluck('user_id'))->distinct('mobile')->groupBy('mobile')->count(),
             ];
 
         }

From b8803b6a30e4dd765096b5dee7f64d6846b3a7c3 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 11:33:51 +0800
Subject: [PATCH 18/20] update

---
 app/Models/CourseSign.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php
index 56a679a..49ddd83 100755
--- a/app/Models/CourseSign.php
+++ b/app/Models/CourseSign.php
@@ -285,7 +285,7 @@ class CourseSign extends SoftDeletesModel
                 // 未去重
                 'total' => $sourseSignList2->count(),
                 // 已去重
-                'total_unique' => User::whereIn('id', $sourseSignList2->pluck('user_id'))->distinct('mobile')->groupBy('mobile')->count(),
+                'total_unique' => User::whereIn('id', $sourseSignList2->pluck('user_id'))->groupBy('mobile1')->count(),
             ];
 
         }

From 8aea84a533fa61ef11f9ac80fd0d9d1eae04047f Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 11:36:55 +0800
Subject: [PATCH 19/20] update

---
 app/Models/CourseSign.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php
index 49ddd83..53a10ab 100755
--- a/app/Models/CourseSign.php
+++ b/app/Models/CourseSign.php
@@ -285,7 +285,7 @@ class CourseSign extends SoftDeletesModel
                 // 未去重
                 'total' => $sourseSignList2->count(),
                 // 已去重
-                'total_unique' => User::whereIn('id', $sourseSignList2->pluck('user_id'))->groupBy('mobile1')->count(),
+                'total_unique' => User::whereIn('id', $sourseSignList2->pluck('user_id'))->groupBy('mobile')->get()->count(),
             ];
 
         }

From 58687a8427a1031e38bebc6a0433b02004dc30d0 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 11:37:32 +0800
Subject: [PATCH 20/20] update

---
 app/Models/CourseSign.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php
index 53a10ab..f0a7c38 100755
--- a/app/Models/CourseSign.php
+++ b/app/Models/CourseSign.php
@@ -285,7 +285,7 @@ class CourseSign extends SoftDeletesModel
                 // 未去重
                 'total' => $sourseSignList2->count(),
                 // 已去重
-                'total_unique' => User::whereIn('id', $sourseSignList2->pluck('user_id'))->groupBy('mobile')->get()->count(),
+                'total_unique' => User::whereIn('id', $sourseSignList2->pluck('user_id'))->distinct('mobile')->groupBy('mobile')->get()->count(),
             ];
 
         }