diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php index cbaa01e..033f1f8 100755 --- a/app/Http/Controllers/Admin/OtherController.php +++ b/app/Http/Controllers/Admin/OtherController.php @@ -370,7 +370,7 @@ class OtherController extends CommonController case 'course_signs_total': // 报名人数明细 - 使用courseSignsTotal方法获取列表(与coursesHome算法一致) - $courseSigns = CourseSign::courseSignsTotal($start_date, $end_date, null, $course_ids, null, true); + $courseSigns = CourseSign::courseSignsTotal($start_date, $end_date, null, $course_ids, true); // 加载关联关系 $courseSigns->load(['user', 'course']); @@ -399,7 +399,7 @@ class OtherController extends CommonController case 'course_signs_pass': // 审核通过人数明细 - 使用courseSignsTotal方法获取列表(与coursesHome算法一致) - $courseSigns = CourseSign::courseSignsTotal($start_date, $end_date, 1, $course_ids, null, true); + $courseSigns = CourseSign::courseSignsTotal($start_date, $end_date, 1, $course_ids, true); // 加载关联关系 $courseSigns->load(['user', 'course']); @@ -502,7 +502,7 @@ class OtherController extends CommonController foreach ($courseSigns as $sign) { $data[] = [ 'company_name' => $sign->user->company->company_name ?? '', - 'area_name' => $sign->user->company->company_area ?? '', + 'company_area' => $sign->user->company->company_area ?? '', 'company_city' => $sign->user->company->company_city ?? '', 'company_province' => $sign->user->company->company_province ?? '', 'user_name' => $sign->user->name ?? '', diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php index 98c8318..317078b 100755 --- a/app/Models/CourseSign.php +++ b/app/Models/CourseSign.php @@ -232,9 +232,8 @@ class CourseSign extends SoftDeletesModel */ public static function area($start_date, $end_date, $status = null, $course_ids = null, $retList = false) { - $courseSignsQuery = self::getStudentList($start_date, $end_date, $status, $course_ids); - // 获取所有学员id - $courseSignList = $courseSignsQuery->whereHas('user'); + $courseSignList = self::getStudentList($start_date, $end_date, $status, $course_ids); + // 地区 $suzhouArea = Company::where('company_city', '苏州市')->pluck('company_area')->unique(); $list = [];