update

app/Http/Controllers/Admin/OtherController.php

@@ -128,7 +128,7 @@ class OtherController extends CommonController
         $list['schoolmate_year'] = User::where('is_schoolmate', 1)->where('created_at', 'like', '%' . date('Y') . '%')->count();
         // 投后企业
         $list['company_invested_total'] = CourseSign::yhInvested();
-        // 元和员工参与企业
+        // 元和员工参与人数
         $list['company_join_total'] = CourseSign::companyJoin();
         // 全市干部参与企业
         $list['company_ganbu_total'] = CourseSign::ganbu();
@@ -254,7 +254,7 @@ class OtherController extends CommonController
         // 入学后被投企业数量（在指定时间范围内报名的学员所在公司中，在入学后被投的公司数量）
         $list['company_invested_after_enrollment_total'] = CourseSign::companyInvestedAfterEnrollment($start_date, $end_date, $course_ids);
 
-        // 元和员工参与企业
+        // 元和员工参与人数
         $list['company_join_total'] = CourseSign::companyJoin($start_date, $end_date, $course_ids);
         // 全市干部参与企业
         $list['company_ganbu_total'] = CourseSign::ganbu($start_date, $end_date, $course_ids);
@@ -727,35 +727,33 @@ class OtherController extends CommonController
                 break;
 
             case 'company_join_total':
-                // 元和员工参与企业明细 - 使用模型方法
+                // 元和员工参与企业明细 - 使用模型方法（现在返回的是用户列表）
-                $companies = CourseSign::companyJoin($start_date, $end_date, $course_ids, true);
+                $users = CourseSign::companyJoin($start_date, $end_date, $course_ids, true);
-                foreach ($companies as $company) {
+                // 加载关联关系
+                $users->load('company');
+                foreach ($users as $user) {
                     $data[] = [
-                        'company_name' => $company->company_name,
+                        'user_name' => $user->name ?? '',
-                        'company_legal_representative' => $company->company_legal_representative ?? '',
+                        'mobile' => $user->mobile ?? '',
-                        'company_date' => $company->company_date ?? '',
+                        'company_name' => $user->company->company_name ?? '',
-                        'company_address' => $company->company_address ?? '',
+                        'company_position' => $user->company_position ?? '',
-                        'company_city' => $company->company_city ?? '',
+                        'company_city' => $user->company->company_city ?? '',
-                        'company_area' => $company->company_area ?? '',
+                        'company_area' => $user->company->company_area ?? '',
-                        'business_scope' => $company->business_scope ?? '',
+                        'company_legal_representative' => $user->company->company_legal_representative ?? '',
-                        'contact_phone' => $company->contact_phone ?? '',
+                        'company_date' => $user->company->company_date ?? '',
-                        'contact_mail' => $company->contact_mail ?? '',
+                        'company_address' => $user->company->company_address ?? '',
-                        'company_tag' => $company->company_tag ?? '',
-                        'credit_code' => ' ' . $company->credit_code ?? '',
                     ];
                 }
                 $fields = [
+                    'user_name' => '学员姓名',
+                    'mobile' => '手机号',
                     'company_name' => '企业名称',
+                    'company_position' => '职位',
+                    'company_city' => '所在城市',
+                    'company_area' => '所在区域',
                     'company_legal_representative' => '法人',
                     'company_date' => '成立时间',
                     'company_address' => '地址',
-                    'company_city' => '所在城市',
-                    'company_area' => '所在区域',
-                    'business_scope' => '营业范围',
-                    'contact_phone' => '联系电话',
-                    'contact_mail' => '联系邮箱',
-                    'company_tag' => '企业资质',
-                    'credit_code' => '统一社会信用代码',
                 ];
                 $filename = '元和员工参与企业明细';
                 break;

app/Models/CourseSign.php

@@ -328,7 +328,7 @@ class CourseSign extends SoftDeletesModel
     }
 
     /**
-     * 元和员工参与企业
+     * 元和员工参与人员
      */
     public static function companyJoin($start_date = null, $end_date = null, $course_ids = null, $retList = false)
     {
@@ -342,13 +342,11 @@ class CourseSign extends SoftDeletesModel
             '禾裕集团', '苏州科服', '信诚管理咨询',
             '集成电路公司', '常州团队', '国企元禾'
         ];
-        $list = Company::whereHas('users', function ($query) use ($courseSignByType, $companyNameKeyword) {
+        $list = User::whereHas('company', function ($query) use ($companyNameKeyword) {
-            $query->whereIn('id', $courseSignByType->pluck('user_id'));
-        })->where(function ($query) use ($companyNameKeyword) {
             foreach ($companyNameKeyword as $item) {
                 $query->orWhere('company_name', 'like', '%' . $item . '%');
             }
-        })->get();
+        })->whereIn('id', $courseSignByType->pluck('user_id'))->get();
         if ($retList) {
             // 返回列表
             return $list;