app/Console/Commands/UpdateUserNo.php

@@ -104,7 +104,7 @@ class UpdateUserNo extends Command
         $tag = '元禾同事';
 
         // 获取元和员工用户列表
-        $users = CourseSign::companyJoin(null, null, null, true, false);
+        $users = CourseSign::companyJoin(null, null, null, true);
 
         $count = 0;
         foreach ($users as $user) {

app/Http/Controllers/Admin/OtherController.php

@@ -290,7 +290,7 @@ class OtherController extends CommonController
         $list['company_invested_year_total'] = CourseSign::companyInvestedYear($start_date, $end_date, $course_ids);
 
         // 元和员工参与人数
-        // $list['company_join_total'] = CourseSign::companyJoin($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);
         // 苏州头部企业
@@ -328,7 +328,7 @@ class OtherController extends CommonController
                     // 被投企业数
                     'yh_invested_total' => CourseSign::yhInvested($start_date, $end_date, [$course->id]),
                     // 元禾同事数
-                    'company_join_total' => CourseSign::companyJoin($start_date, $end_date, [$course->id], false, false, false),
+                    'company_join_total' => CourseSign::companyJoin($start_date, $end_date, [$course->id]),
                 ];
             }
         }
@@ -557,7 +557,7 @@ class OtherController extends CommonController
                             'course_signs_pass' => CourseSign::courseSignsTotal($start_date, $end_date, 1, [$course->id], false, false),
                             'genban_total' => CourseSign::genban($start_date, $end_date, [$course->id]),
                             'yh_invested_total' => CourseSign::yhInvested($start_date, $end_date, [$course->id]),
-                            'company_join_total' => CourseSign::companyJoin($start_date, $end_date, [$course->id], false, false),
+                            'company_join_total' => CourseSign::companyJoin($start_date, $end_date, [$course->id]),
                         ];
                     }
                 }
@@ -1045,7 +1045,7 @@ class OtherController extends CommonController
 
             case 'company_join_total':
                 // 元和员工参与人员明细 - 使用模型方法（现在返回的是用户列表）
-                $users = CourseSign::companyJoin($start_date, $end_date, $course_ids, true, false);
+                $users = CourseSign::companyJoin($start_date, $end_date, $course_ids, true);
                 // 加载关联关系
                 $users->load('company');
                 foreach ($users as $user) {

app/Models/CourseSign.php

@@ -584,7 +584,7 @@ class CourseSign extends SoftDeletesModel
     /**
      * 元和员工参人员
      */
-    public static function companyJoin($start_date = null, $end_date = null, $course_ids = null, $retList = false, $needHistory = true)
+    public static function companyJoin($start_date = null, $end_date = null, $course_ids = null, $retList = false)
     {
         $courseSignsQuery = self::getStudentList($start_date, $end_date, null, $course_ids);
         $courseSignByType = $courseSignsQuery->get();
@@ -620,17 +620,14 @@ class CourseSign extends SoftDeletesModel
         } else {
             // 基础数据
             $baseCount = $list->count();
-            $employeeParticipations = 0;
+            // 额外数据
-            if ($needHistory) {
+            $employeeParticipations = EmployeeParticipation::where(function ($query) use ($start_date, $end_date) {
-                // 额外数据
+                // 开始结束日期的筛选。or查询
-                $employeeParticipations = EmployeeParticipation::where(function ($query) use ($start_date, $end_date) {
+                if ($start_date && $end_date) {
-                    // 开始结束日期的筛选。or查询
+                    $query->whereBetween('start_date', [$start_date, $end_date])
-                    if ($start_date && $end_date) {
+                        ->orWhereBetween('end_date', [$start_date, $end_date]);
-                        $query->whereBetween('start_date', [$start_date, $end_date])
+                }
-                            ->orWhereBetween('end_date', [$start_date, $end_date]);
+            })->where('type', 1)->sum('total');
-                    }
-                })->where('type', 1)->sum('total');
-            }
             // 返回统计数据
             return $baseCount + $employeeParticipations;
         }