From 5f0af87f3083dd4a0fa22be107a2d319eec47961 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 13:02:47 +0800
Subject: [PATCH 01/16] update

---
 app/Models/CourseSign.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php
index f0a7c38..d05d983 100755
--- a/app/Models/CourseSign.php
+++ b/app/Models/CourseSign.php
@@ -136,7 +136,7 @@ class CourseSign extends SoftDeletesModel
                 $query->whereIn('course_id', $course_ids);
             }
         })->whereNotIn('status', [4, 5])->get();
-        $user = User::whereIn('id', $courseSignByType->pluck('user_id'))->distinct('mobile');
+        $user = User::whereIn('id', $courseSignByType->pluck('user_id'));
         if ($retList) {
             // 列表
             return $user->groupBy('mobile')->get();
@@ -285,7 +285,7 @@ class CourseSign extends SoftDeletesModel
                 // 未去重
                 'total' => $sourseSignList2->count(),
                 // 已去重
-                'total_unique' => User::whereIn('id', $sourseSignList2->pluck('user_id'))->distinct('mobile')->groupBy('mobile')->get()->count(),
+                'total_unique' => User::whereIn('id', $sourseSignList2->pluck('user_id'))->groupBy('mobile')->get()->count(),
             ];
 
         }

From 6d1f69ac33aafcdbb76aab21b22db1712ae6e8ed Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 13:06:10 +0800
Subject: [PATCH 02/16] 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 d05d983..ef51e47 100755
--- a/app/Models/CourseSign.php
+++ b/app/Models/CourseSign.php
@@ -298,7 +298,7 @@ class CourseSign extends SoftDeletesModel
             'area' => '苏州市外',
             'total' => $courseSignList3->count(),
             // 已去重
-            'total_unique' => User::groupBy('mobile')->whereIn('id', $courseSignList3->pluck('user_id'))->count(),
+            'total_unique' => User::groupBy('mobile')->whereIn('id', $courseSignList3->pluck('user_id'))->get()->count(),
         ];
 
         if ($retList) {

From 51fae3d762cf5e5dc7970a77ff9900700acf1f4a Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 13:15:48 +0800
Subject: [PATCH 03/16] update

---
 app/Http/Controllers/Mobile/OtherController.php | 5 ++---
 app/Repositories/YuanheRepository.php           | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Mobile/OtherController.php b/app/Http/Controllers/Mobile/OtherController.php
index f238021..4fc1d49 100755
--- a/app/Http/Controllers/Mobile/OtherController.php
+++ b/app/Http/Controllers/Mobile/OtherController.php
@@ -95,9 +95,8 @@ class OtherController extends CommonController
         }
         $YuanheRepository = new YuanheRepository();
         $result = $YuanheRepository->search(['keyword' => $all['company_name']]);
-        $result = json_decode($result, true);
-        if (!$result) {
-            return $this->fail([ResponseCode::ERROR_PARAMETER, '获取失败']);
+        if (empty($result)) {
+            return $this->fail([ResponseCode::ERROR_PARAMETER, '无数据']);
         }
         $list = [];
         foreach ($result as $item) {
diff --git a/app/Repositories/YuanheRepository.php b/app/Repositories/YuanheRepository.php
index ade2cb4..4bae544 100755
--- a/app/Repositories/YuanheRepository.php
+++ b/app/Repositories/YuanheRepository.php
@@ -73,10 +73,10 @@ class YuanheRepository
             if ($result['code'] == 200) {
                 return $result['data'];
             } else {
-                return false;
+                return [];
             }
         } catch (\Exception $e) {
-            return false;
+            return [];
         }
     }
 

From fcf76f98acc0935773d8f96daeb1a9ad962d6a19 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 13:20:30 +0800
Subject: [PATCH 04/16] update

---
 app/Http/Controllers/Admin/OtherController.php |  3 +--
 app/Models/CourseSign.php                      | 16 ++++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php
index 2bf97ca..5b5bd80 100755
--- a/app/Http/Controllers/Admin/OtherController.php
+++ b/app/Http/Controllers/Admin/OtherController.php
@@ -182,8 +182,7 @@ class OtherController extends CommonController
         }
 
         // 全国数据
-        $countryArea = Company::groupBy('company_city')->whereNotNull('company_city')
-            ->get(['company_city']);
+        $countryArea = Company::groupBy('company_city')->whereNotNull('company_city')->get(['company_city']);
         $country = [];
         foreach ($countryArea as $item) {
             $country[] = [
diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php
index ef51e47..8200c18 100755
--- a/app/Models/CourseSign.php
+++ b/app/Models/CourseSign.php
@@ -120,14 +120,14 @@ class CourseSign extends SoftDeletesModel
             $query->whereBetween('start_date', [$start_date, $end_date])
                 ->whereBetween('end_date', [$start_date, $end_date]);
         })->whereHas('user', function ($query) use ($area) {
-            if ($area) {
-                if ($area == '苏州市外') {
-                    $allArea = ParameterDetail::where('parameter_id', 5)->get();
-                    $query->whereNotIn('company_area', $allArea->pluck('value'));
-                } else {
-                    $query->where('company_area', $area);
-                }
-            }
+//            if ($area) {
+//                if ($area == '苏州市外') {
+//                    $allArea = ParameterDetail::where('parameter_id', 5)->get();
+//                    $query->whereNotIn('company_area', $allArea->pluck('value'));
+//                } else {
+//                    $query->where('company_area', $area);
+//                }
+//            }
         })->where(function ($query) use ($status, $course_ids) {
             if (isset($status)) {
                 $query->where('status', $status);

From 3b227ab929cd9cfa5e062babe41e8ae97407456b Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 13:57:46 +0800
Subject: [PATCH 05/16] update

---
 .../Controllers/Mobile/OtherController.php    | 32 +++++++++++++++++++
 routes/api.php                                |  2 ++
 2 files changed, 34 insertions(+)

diff --git a/app/Http/Controllers/Mobile/OtherController.php b/app/Http/Controllers/Mobile/OtherController.php
index 4fc1d49..58cb21c 100755
--- a/app/Http/Controllers/Mobile/OtherController.php
+++ b/app/Http/Controllers/Mobile/OtherController.php
@@ -108,6 +108,38 @@ class OtherController extends CommonController
         return $this->success($list);
     }
 
+    /**
+     * @OA\Get(
+     *     path="/api/mobile/other/company-detail",
+     *     tags={"小程序-其他"},
+     *     summary="公司详情",
+     *     @OA\Parameter(name="company_name", in="query", @OA\Schema(type="integer"), required=true, description="公司名字"),
+     *     @OA\Response(
+     *         response=200,
+     *         description="操作成功"
+     *     )
+     * )
+     */
+    public function companyDetail()
+    {
+        $all = \request()->all();
+        $messages = [
+            'company_name.required' => '公司名称必填',
+        ];
+        $validator = Validator::make($all, [
+            'company_name' => 'required',
+        ], $messages);
+        if ($validator->fails()) {
+            return $this->fail([ResponseCode::ERROR_PARAMETER, implode(',', $validator->errors()->all())]);
+        }
+        $YuanheRepository = new YuanheRepository();
+        $result = $YuanheRepository->companyInfo(['enterpriseName' => $all['company_name']]);
+        if (empty($result)) {
+            return $this->fail([ResponseCode::ERROR_PARAMETER, '无数据']);
+        }
+        return $this->success($result);
+    }
+
     /**
      * @OA\Get(
      *     path="/api/mobile/other/company-list",
diff --git a/routes/api.php b/routes/api.php
index bb82395..f5abbb4 100755
--- a/routes/api.php
+++ b/routes/api.php
@@ -277,6 +277,8 @@ Route::group(["namespace" => "Mobile", "prefix" => "mobile"], function () {
     Route::get('other/banner', [\App\Http\Controllers\Mobile\OtherController::class, "banner"]);
     // 公司查询
     Route::get('other/company', [\App\Http\Controllers\Mobile\OtherController::class, "company"]);
+    // 公司详情
+    Route::get('other/company-detail', [\App\Http\Controllers\Mobile\OtherController::class, "companyDetail"]);
     // 公司查询
     Route::get('other/company-list', [\App\Http\Controllers\Mobile\OtherController::class, "companyList"]);
     // 通知

From 3919eb3c49e2ffae71a28a73d224a2a0877a10d7 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 14:46:34 +0800
Subject: [PATCH 06/16] update

---
 app/Models/CourseSign.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php
index 8200c18..a5bfc4a 100755
--- a/app/Models/CourseSign.php
+++ b/app/Models/CourseSign.php
@@ -136,10 +136,10 @@ class CourseSign extends SoftDeletesModel
                 $query->whereIn('course_id', $course_ids);
             }
         })->whereNotIn('status', [4, 5])->get();
-        $user = User::whereIn('id', $courseSignByType->pluck('user_id'));
+        $user = User::whereIn('id', $courseSignByType->pluck('user_id'))->groupBy('mobile')->get();
         if ($retList) {
             // 列表
-            return $user->groupBy('mobile')->get();
+            return $user;
         } else {
             // 统计数据
             return $user->count();

From 9a5827665fbe86e51a714605a50cd83dd3c8d998 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 15:17:47 +0800
Subject: [PATCH 07/16] update

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

diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php
index 5b5bd80..768168b 100755
--- a/app/Http/Controllers/Admin/OtherController.php
+++ b/app/Http/Controllers/Admin/OtherController.php
@@ -683,7 +683,8 @@ class OtherController extends CommonController
     private function getCoursesHomeParams()
     {
         $start_date = request('start_date', CourseType::START_DATE);
-        $end_date = request('end_date', date('Y-m-d'));
+        // 默认结束日期一年以后
+        $end_date = request('end_date', date('Y-m-d', strtotime('+1 year')));
         $course_type_id = request('course_type_id', '');
         if ($course_type_id) {
             // 部分

From 53d9b151f19a69fa91a100590f6d1f84a199c3a1 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 15:34:35 +0800
Subject: [PATCH 08/16] update

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

diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php
index 768168b..57985de 100755
--- a/app/Http/Controllers/Admin/OtherController.php
+++ b/app/Http/Controllers/Admin/OtherController.php
@@ -684,7 +684,7 @@ class OtherController extends CommonController
     {
         $start_date = request('start_date', CourseType::START_DATE);
         // 默认结束日期一年以后
-        $end_date = request('end_date', date('Y-m-d', strtotime('+1 year')));
+        $end_date = request('end_date', date('Y-m-d', strtotime('+10 year')));
         $course_type_id = request('course_type_id', '');
         if ($course_type_id) {
             // 部分

From 6ac1bb2e816729884728cb43c690826d5ba0d34a Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 15:36:41 +0800
Subject: [PATCH 09/16] update

---
 app/Models/CourseSign.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php
index a5bfc4a..dd82f72 100755
--- a/app/Models/CourseSign.php
+++ b/app/Models/CourseSign.php
@@ -89,8 +89,8 @@ class CourseSign extends SoftDeletesModel
             }
         })->whereHas('course', function ($query) use ($start_date, $end_date) {
             // 开始结束日期的筛选。or查询
-            $query->whereBetween('start_date', [$start_date, $end_date])
-                ->whereBetween('end_date', [$start_date, $end_date]);
+//            $query->whereBetween('start_date', [$start_date, $end_date])
+//                ->whereBetween('end_date', [$start_date, $end_date]);
         })->whereHas('user', function ($query) use ($area) {
             if (isset($area)) {
                 if ($area == '苏州市外') {

From 1b82bca22681939c3664bad35e18b512ca66e78d Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 15:37:38 +0800
Subject: [PATCH 10/16] update

---
 app/Models/CourseSign.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php
index dd82f72..3dc16a8 100755
--- a/app/Models/CourseSign.php
+++ b/app/Models/CourseSign.php
@@ -89,8 +89,8 @@ class CourseSign extends SoftDeletesModel
             }
         })->whereHas('course', function ($query) use ($start_date, $end_date) {
             // 开始结束日期的筛选。or查询
-//            $query->whereBetween('start_date', [$start_date, $end_date])
-//                ->whereBetween('end_date', [$start_date, $end_date]);
+            $query->whereBetween('start_date', [$start_date, $end_date])
+                ->orWhereBetween('end_date', [$start_date, $end_date]);
         })->whereHas('user', function ($query) use ($area) {
             if (isset($area)) {
                 if ($area == '苏州市外') {

From 10921fe21073587b6f107190b7535c6279a1cafa Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 15:39:12 +0800
Subject: [PATCH 11/16] update

---
 app/Models/CourseSign.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php
index 3dc16a8..91a287d 100755
--- a/app/Models/CourseSign.php
+++ b/app/Models/CourseSign.php
@@ -118,7 +118,7 @@ class CourseSign extends SoftDeletesModel
         $courseSignByType = CourseSign::whereHas('course', function ($query) use ($start_date, $end_date) {
             // 开始结束日期的筛选。or查询
             $query->whereBetween('start_date', [$start_date, $end_date])
-                ->whereBetween('end_date', [$start_date, $end_date]);
+                ->orWhereBetween('end_date', [$start_date, $end_date]);
         })->whereHas('user', function ($query) use ($area) {
 //            if ($area) {
 //                if ($area == '苏州市外') {
@@ -154,7 +154,7 @@ class CourseSign extends SoftDeletesModel
         $courseSignByType = CourseSign::whereHas('course', function ($query) use ($start_date, $end_date) {
             // 开始结束日期的筛选。or查询
             $query->whereBetween('start_date', [$start_date, $end_date])
-                ->whereBetween('end_date', [$start_date, $end_date]);
+                ->orWhereBetween('end_date', [$start_date, $end_date]);
         })->whereNotIn('status', [4, 5])->get();
         $list = Company::whereHas('users', function ($query) use ($courseSignByType) {
             $query->whereIn('id', $courseSignByType->pluck('user_id'));
@@ -181,7 +181,7 @@ class CourseSign extends SoftDeletesModel
         $courseSignsForGanbu = self::whereHas('course', function ($query) use ($start_date, $end_date) {
             // 开始结束日期的筛选。or查询
             $query->whereBetween('start_date', [$start_date, $end_date])
-                ->whereBetween('end_date', [$start_date, $end_date]);
+                ->orWhereBetween('end_date', [$start_date, $end_date]);
         })->where(function ($query) use ($course_ids) {
             if ($course_ids) {
                 $query->whereIn('course_id', $course_ids);
@@ -211,7 +211,7 @@ class CourseSign extends SoftDeletesModel
         $courseSignsForStock = self::whereHas('course', function ($query) use ($start_date, $end_date) {
             // 开始结束日期的筛选。or查询
             $query->whereBetween('start_date', [$start_date, $end_date])
-                ->whereBetween('end_date', [$start_date, $end_date]);
+                ->orWhereBetween('end_date', [$start_date, $end_date]);
         })->where(function ($query) use ($course_ids) {
             if ($course_ids) {
                 $query->whereIn('course_id', $course_ids);
@@ -268,7 +268,7 @@ class CourseSign extends SoftDeletesModel
         })->whereHas('course', function ($query) use ($start_date, $end_date) {
             // 开始结束日期的筛选。or查询
             $query->whereBetween('start_date', [$start_date, $end_date])
-                ->whereBetween('end_date', [$start_date, $end_date]);
+                ->orWhereBetween('end_date', [$start_date, $end_date]);
         })->whereHas('user')->whereNotIn('status', [4, 5]);
         // 地区
         $suzhouArea = Company::where('company_city', '苏州市')->pluck('company_area')->unique();

From d6960ac70b8250d4282d56d5855c0368845216f6 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 15:40:40 +0800
Subject: [PATCH 12/16] update

---
 app/Models/CourseSign.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php
index 91a287d..eb0d8ec 100755
--- a/app/Models/CourseSign.php
+++ b/app/Models/CourseSign.php
@@ -92,14 +92,14 @@ class CourseSign extends SoftDeletesModel
             $query->whereBetween('start_date', [$start_date, $end_date])
                 ->orWhereBetween('end_date', [$start_date, $end_date]);
         })->whereHas('user', function ($query) use ($area) {
-            if (isset($area)) {
-                if ($area == '苏州市外') {
-                    $allArea = ParameterDetail::where('parameter_id', 5)->get();
-                    $query->whereNotIn('company_area', $allArea->pluck('value'));
-                } else {
-                    $query->where('company_area', $area);
-                }
-            }
+//            if (isset($area)) {
+//                if ($area == '苏州市外') {
+//                    $allArea = ParameterDetail::where('parameter_id', 5)->get();
+//                    $query->whereNotIn('company_area', $allArea->pluck('value'));
+//                } else {
+//                    $query->where('company_area', $area);
+//                }
+//            }
         })->whereNotIn('status', [4, 5]);
         if ($retList) {
             // 返回列表

From bfcf451190e7be74439865d6bb26d0d7b3c96e33 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 16:28:58 +0800
Subject: [PATCH 13/16] update

---
 app/Models/CourseSign.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php
index eb0d8ec..a342cfe 100755
--- a/app/Models/CourseSign.php
+++ b/app/Models/CourseSign.php
@@ -117,8 +117,8 @@ class CourseSign extends SoftDeletesModel
     {
         $courseSignByType = CourseSign::whereHas('course', function ($query) use ($start_date, $end_date) {
             // 开始结束日期的筛选。or查询
-            $query->whereBetween('start_date', [$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]);
         })->whereHas('user', function ($query) use ($area) {
 //            if ($area) {
 //                if ($area == '苏州市外') {

From ff7d8ebf81375ca2c3b10f6b117f1b1d0abdc796 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 16:29:51 +0800
Subject: [PATCH 14/16] update

---
 app/Models/CourseSign.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php
index a342cfe..eb0d8ec 100755
--- a/app/Models/CourseSign.php
+++ b/app/Models/CourseSign.php
@@ -117,8 +117,8 @@ class CourseSign extends SoftDeletesModel
     {
         $courseSignByType = CourseSign::whereHas('course', function ($query) use ($start_date, $end_date) {
             // 开始结束日期的筛选。or查询
-            $query->whereBetween('start_date', [$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]);
         })->whereHas('user', function ($query) use ($area) {
 //            if ($area) {
 //                if ($area == '苏州市外') {

From 90521cc8c5f7410176c85b4ff16f537978d9e087 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 16:30:17 +0800
Subject: [PATCH 15/16] update

---
 app/Models/CourseSign.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php
index eb0d8ec..09ec734 100755
--- a/app/Models/CourseSign.php
+++ b/app/Models/CourseSign.php
@@ -89,8 +89,8 @@ class CourseSign extends SoftDeletesModel
             }
         })->whereHas('course', function ($query) use ($start_date, $end_date) {
             // 开始结束日期的筛选。or查询
-            $query->whereBetween('start_date', [$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]);
         })->whereHas('user', function ($query) use ($area) {
 //            if (isset($area)) {
 //                if ($area == '苏州市外') {

From 70634f7b952de9b725322a633470d1a959930ca7 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 16:31:14 +0800
Subject: [PATCH 16/16] update

---
 app/Models/CourseSign.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php
index 09ec734..eb0d8ec 100755
--- a/app/Models/CourseSign.php
+++ b/app/Models/CourseSign.php
@@ -89,8 +89,8 @@ class CourseSign extends SoftDeletesModel
             }
         })->whereHas('course', function ($query) use ($start_date, $end_date) {
             // 开始结束日期的筛选。or查询
-            $query->whereBetween('start_date', [$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]);
         })->whereHas('user', function ($query) use ($area) {
 //            if (isset($area)) {
 //                if ($area == '苏州市外') {