update

app/Http/Controllers/Admin/OtherController.php

@@ -176,19 +176,8 @@ class OtherController extends CommonController
         // 区域明细统计
         $areas = ParameterDetail::where('parameter_id', 5)->get();
         foreach ($areas as $area) {
-//            $courseSignByArea = CourseSign::where('status', 1)
-//                ->whereHas('user', function ($query) use ($area) {
-//                    $query->where('company_area', $area->value);
-//                })->whereDate('created_at', '>=', $start_date)
-//                ->whereDate('created_at', '<=', $end_date)
-//                ->get();
-
-            $area->course_signs_pass = CourseSign::courseSignsTotal($start_date, $end_date, 1, null,$area->value);
-            $area->course_signs_pass_unique = CourseSign::courseSignsTotalByUnique($start_date, $end_date, 1, null,$area->value);
-
-           // $area->course_signs_pass = $courseSignByArea->count();
-           // $area->course_signs_pass_unique = User::whereIn('id', $courseSignByArea->pluck('user_id'))->distinct('mobile')->count();
-
+            $area->course_signs_pass = CourseSign::courseSignsTotal($start_date, $end_date, 1, null, $area->value);
+            $area->course_signs_pass_unique = CourseSign::courseSignsTotalByUnique($start_date, $end_date, 1, null, $area->value);
         }
         return $this->success(compact('list', 'courseTypesSum', 'areas'));
     }
@@ -310,7 +299,7 @@ class OtherController extends CommonController
     {
         $model = new DoorRepository();
         $result = $model->getAllDoorInfo();
-        dd(json_encode($result,JSON_UNESCAPED_UNICODE));
+        dd(json_encode($result, JSON_UNESCAPED_UNICODE));
     }
 
 

app/Models/CourseSign.php

@@ -83,7 +83,12 @@ class CourseSign extends SoftDeletesModel
             ->whereDate('created_at', '<=', $end_date)
             ->whereHas('user', function ($query) use ($area) {
                 if ($area) {
-                    $query->where('company_area', $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)) {
@@ -105,7 +110,10 @@ class CourseSign extends SoftDeletesModel
         $courseSignByType = CourseSign::whereDate('created_at', '>=', $start_date)
             ->whereDate('created_at', '<=', $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);
                 }
             })->where(function ($query) use ($status, $course_ids) {