From 025d73f6496ae0070cd97cb8f7e4803bffa30fe9 Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Fri, 21 Nov 2025 16:48:20 +0800 Subject: [PATCH] update --- app/Http/Controllers/Admin/OtherController.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php index 60c2733..e001064 100755 --- a/app/Http/Controllers/Admin/OtherController.php +++ b/app/Http/Controllers/Admin/OtherController.php @@ -287,7 +287,7 @@ class OtherController extends CommonController * tags={"其他"}, * summary="课程统计明细导出", * description="导出课程统计数据的明细", - * @OA\Parameter(name="export_type", in="query", @OA\Schema(type="string"), required=true, description="导出类型：invested_companies-被投企业明细, course_signs_total-报名人数明细, course_signs_pass-审核通过人数明细, course_signs_pass_unique-审核通过人数去重明细, course_types-课程分类明细, areas-区域明细, company_market-上市公司明细, ganbu-跟班学员明细, company_market_year-今年上市公司明细, company_market_after_enrollment-入学后上市公司明细"), + * @OA\Parameter(name="export_type", in="query", @OA\Schema(type="string"), required=true, description="导出类型：course_signs_invested-被投企业明细, course_signs_total-报名人数明细, course_signs_pass-审核通过人数明细, course_signs_pass_unique-审核通过人数去重明细, courseTypesSum-课程分类明细, areas-区域明细, company_market_total-上市公司明细, ganbu_total-跟班学员明细, company_market_year_total-今年上市公司明细, company_market_after_enrollment_total-入学后上市公司明细"), * @OA\Parameter(name="start_date", in="query", @OA\Schema(type="string"), required=false, description="开始日期"), * @OA\Parameter(name="end_date", in="query", @OA\Schema(type="string"), required=false, description="结束日期"), * @OA\Parameter(name="course_type_id", in="query", @OA\Schema(type="string"), required=false, description="课程体系id，多个英文逗号"), @@ -318,7 +318,7 @@ class OtherController extends CommonController $filename = ''; switch ($export_type) { - case 'invested_companies': + case 'course_signs_invested': // 被投企业明细 - 使用与coursesHome相同的算法 $companies = CourseSign::yhInvested($start_date, $end_date, true); foreach ($companies as $company) { @@ -439,7 +439,7 @@ class OtherController extends CommonController $filename = '审核通过人数去重明细'; break; - case 'course_types': + case 'courseTypesSum': // 课程分类明细 - 与coursesHome中的courseTypesSum逻辑保持一致 $courseTypes = CourseType::whereIn('id', $course_type_id)->get(); foreach ($courseTypes as $courseType) { @@ -482,7 +482,7 @@ class OtherController extends CommonController $filename = '区域明细'; break; - case 'company_market': + case 'company_market_total': // 上市公司明细 - 所有上市公司 $companies = Company::companyMarket($start_date, $end_date, true); foreach ($companies as $company) { @@ -508,7 +508,7 @@ class OtherController extends CommonController $filename = '上市公司明细'; break; - case 'ganbu': + case 'ganbu_total': // 跟班学员明细 - 使用模型方法 $users = CourseSign::ganbu($start_date, $end_date, $course_ids, true); @@ -547,9 +547,9 @@ class OtherController extends CommonController $filename = '跟班学员明细'; break; - case 'company_market_year': + case 'company_market_year_total': // 今年上市公司明细 - 使用模型方法 - $companies = Company::companyMarketYear($start_date, $end_date,null, true); + $companies = Company::companyMarketYear($start_date, $end_date, $course_ids, true); foreach ($companies as $company) { $data[] = [ 'company_name' => $company->company_name, @@ -573,7 +573,7 @@ class OtherController extends CommonController $filename = '今年上市公司明细'; break; - case 'company_market_after_enrollment': + case 'company_market_after_enrollment_total': // 入学后上市公司明细 - 使用模型方法 $companiesAfterEnrollment = CourseSign::companyMarketAfterEnrollment($start_date, $end_date, $course_ids->toArray(), true);