From a627852c3601198cbbbc5ae34c0e6c7cfbb70012 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Thu, 27 Nov 2025 10:05:46 +0800
Subject: [PATCH 1/4] update

---
 app/Http/Controllers/Admin/OtherController.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php
index c2dc2b3..c630553 100755
--- a/app/Http/Controllers/Admin/OtherController.php
+++ b/app/Http/Controllers/Admin/OtherController.php
@@ -591,6 +591,7 @@ class OtherController extends CommonController
                         'mobile' => $user->mobile ?? '',
                         'company_name' => $user->company_name ?? '',
                         'company_position' => $user->company_position ?? '',
+                        'from' => $user->from ?? '',
                     ];
                 }
                 $fields = [
@@ -599,6 +600,7 @@ class OtherController extends CommonController
                     'mobile' => '手机号',
                     'company_name' => '企业名称',
                     'company_position' => '职位',
+                    'from' => '标签',
                 ];
                 $filename = '跟班学员明细';
                 break;

From 69deacb2f56d851ff372e0b3e887b7c695f90cc7 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Thu, 27 Nov 2025 10:16:05 +0800
Subject: [PATCH 2/4] update

---
 .../Controllers/Admin/CalendarsController.php    | 16 ++++++++++++++--
 app/Http/Controllers/Admin/OtherController.php   |  2 +-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Admin/CalendarsController.php b/app/Http/Controllers/Admin/CalendarsController.php
index 1490dbf..1367922 100644
--- a/app/Http/Controllers/Admin/CalendarsController.php
+++ b/app/Http/Controllers/Admin/CalendarsController.php
@@ -50,7 +50,7 @@ class CalendarsController extends BaseController
     public function index()
     {
         $all = \request()->all();
-        $list = Calendar::with('course', 'courseContent','historyCourses')
+        $list = Calendar::with('course', 'courseContent', 'historyCourses')
             ->where(function ($query) use ($all) {
                 if (isset($all['month'])) {
                     $query->where('start_time', 'like', $all['month'] . '%');
@@ -61,7 +61,19 @@ class CalendarsController extends BaseController
             $list = $list->toArray();
             return Excel::download(new CommonExport($list, $all['export_fields'] ?? ''), ($all['file_name'] ?? '') . date('YmdHis') . '.xlsx');
         }
-        return $this->success($list);
+        // 本月日历天数
+        $monthDayCalendar = Calendar::where(function ($query) use ($all) {
+            if (isset($all['month'])) {
+                $query->where('start_time', 'like', $all['month'] . '%');
+            }
+        })->where('is_count_days', 1)->sum('days');
+        // 本年日历天数
+        $yearDayCalendar = Calendar::where(function ($query) use ($all) {
+            if (isset($all['month'])) {
+                $query->where('start_time', 'like', $all['month'] . '%');
+            }
+        })->where('is_count_days', 1)->sum('days');
+        return $this->success(compact('list', 'monthDayCalendar', 'yearDayCalendar'));
     }
 
     /**
diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php
index c630553..5a5d2b5 100755
--- a/app/Http/Controllers/Admin/OtherController.php
+++ b/app/Http/Controllers/Admin/OtherController.php
@@ -141,7 +141,7 @@ class OtherController extends CommonController
         // 重点上市公司
         $list['cover_stock_total'] = CourseSign::shangshi();
         // 本月课程
-        $monthCourses = Calendar::with('course.teacher')->where('type', 1)
+        $monthCourses = Calendar::with('course.teacher')
             ->where('date', 'like', '%' . date('Y-m') . '%')
             ->get();
         // 课程统计

From 677d8373b6e9ce6d422b88077099127fbdde926e Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Thu, 27 Nov 2025 10:31:14 +0800
Subject: [PATCH 3/4] update

---
 app/Http/Controllers/Admin/CalendarsController.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Admin/CalendarsController.php b/app/Http/Controllers/Admin/CalendarsController.php
index 1367922..ba19e6b 100644
--- a/app/Http/Controllers/Admin/CalendarsController.php
+++ b/app/Http/Controllers/Admin/CalendarsController.php
@@ -70,7 +70,9 @@ class CalendarsController extends BaseController
         // 本年日历天数
         $yearDayCalendar = Calendar::where(function ($query) use ($all) {
             if (isset($all['month'])) {
-                $query->where('start_time', 'like', $all['month'] . '%');
+                // 获取$all['month']的年份部分
+                $year = date('Y', strtotime($all['month']));
+                $query->where('start_time', 'like', $year . '%');
             }
         })->where('is_count_days', 1)->sum('days');
         return $this->success(compact('list', 'monthDayCalendar', 'yearDayCalendar'));

From f4b06a0507a11c2aebff46b8e413edba0b3aa2b0 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Thu, 27 Nov 2025 10:43:21 +0800
Subject: [PATCH 4/4] update

---
 app/Models/CourseSign.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php
index 16856bf..e932702 100755
--- a/app/Models/CourseSign.php
+++ b/app/Models/CourseSign.php
@@ -157,7 +157,7 @@ class CourseSign extends SoftDeletesModel
     public static function yhInvested($start_date = null, $end_date = null, $course_ids = null, $retList = false)
     {
         // 判断是否使用默认时间
-        $isDefaultDate = empty($start_date) || $start_date == CourseType::START_DATE;
+        $isDefaultDate = empty($start_date) || $start_date == CourseType::START_DATE || empty($course_ids);
 
         // 获取学员ID列表
         if ($isDefaultDate) {