From d6197092412d03890750b8d5d463c74037bb40d7 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Mon, 19 Jan 2026 13:42:42 +0800
Subject: [PATCH] update

---
 app/Http/Controllers/Admin/CompanyController.php | 13 +++++++++++--
 app/Http/Controllers/Admin/OtherController.php   |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Admin/CompanyController.php b/app/Http/Controllers/Admin/CompanyController.php
index 8ee3b8b..1685aac 100644
--- a/app/Http/Controllers/Admin/CompanyController.php
+++ b/app/Http/Controllers/Admin/CompanyController.php
@@ -117,6 +117,7 @@ class CompanyController extends BaseController
      *     @OA\Parameter(name="is_schoolmate", in="query", @OA\Schema(type="string"), required=false, description="是否校友0否1是"),
      *     @OA\Parameter(name="course_start_date", in="query", @OA\Schema(type="string"), required=false, description="课程开始日期（筛选课程起止时间在范围内的企业）"),
      *     @OA\Parameter(name="course_end_date", in="query", @OA\Schema(type="string"), required=false, description="课程结束日期（筛选课程起止时间在范围内的企业）"),
+     *     @OA\Parameter(name="is_chart", in="query", @OA\Schema(type="string"), required=false, description="课程是否参与统计0否1是（按公司下用户关联的课程筛选）"),
      *     @OA\Response(
      *      response="200",
      *      description="暂无"
@@ -147,8 +148,10 @@ class CompanyController extends BaseController
                 });
             }
             // 课程起止时间筛选
-            if ((isset($all['course_start_date']) && !empty($all['course_start_date'])) || 
-                (isset($all['course_end_date']) && !empty($all['course_end_date']))) {
+            if (
+                (isset($all['course_start_date']) && !empty($all['course_start_date'])) ||
+                (isset($all['course_end_date']) && !empty($all['course_end_date']))
+            ) {
                 $query->whereHas('courses', function ($q) use ($all) {
                     $course_start_date = $all['course_start_date'] ?? null;
                     $course_end_date = $all['course_end_date'] ?? null;
@@ -167,6 +170,12 @@ class CompanyController extends BaseController
                     }
                 });
             }
+            // 课程是否参与统计：0否 1是（按公司下用户关联的课程的 is_chart 筛选）
+            if (isset($all['is_chart']) && $all['is_chart'] !== '') {
+                $query->whereHas('courses', function ($q) use ($all) {
+                    $q->where('is_chart', $all['is_chart']);
+                });
+            }
             if (isset($all['user_name']) && !empty($all['user_name'])) {
                 $query->where('username', 'like', '%' . $all['user_name'] . '%');
             }
diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php
index 7fdc4cc..6a2068a 100755
--- a/app/Http/Controllers/Admin/OtherController.php
+++ b/app/Http/Controllers/Admin/OtherController.php
@@ -318,7 +318,7 @@ class OtherController extends CommonController
 
         $course_ids = $courses->pluck('id');
 
-        // 上市公司数（所有上市公司）
+        // 上市公司覆盖数（所有上市公司）
         $list['company_market_total'] = CourseSign::shangshi($start_date, $end_date, $course_ids);
         // 跟班学员数（在指定时间范围内报名的学员中，from为'跟班学员'的数量）
         $list['ganbu_total'] = CourseSign::genban($start_date, $end_date, $course_ids);