From b6583ade80d66860e82206a60d9ec94d20cce5fc Mon Sep 17 00:00:00 2001 From: liyinglin Date: Wed, 3 Jan 2024 20:26:26 +0800 Subject: [PATCH] 1 --- app/Http/Controllers/Admin/StatisticsController.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Admin/StatisticsController.php b/app/Http/Controllers/Admin/StatisticsController.php index cb55607..121d7a8 100755 --- a/app/Http/Controllers/Admin/StatisticsController.php +++ b/app/Http/Controllers/Admin/StatisticsController.php @@ -400,7 +400,7 @@ class StatisticsController extends CommonController } })->where('admin_id', $user->id)->pluck('area_id'); } - $data = Area::with('project', 'building')->where(function ($query) use ($areaId) { + $data = Area::where('project_id', $project_id)->with('project', 'building')->where(function ($query) use ($areaId) { if ($areaId) { $query->whereIn('id', $areaId); } @@ -412,14 +412,14 @@ class StatisticsController extends CommonController foreach ($data as $item) { // 获取所有床位id - $bedIds = Bed::where('project_id', $project_id)->where('area_id', $item->id)->pluck('id'); - $order = Orders::where('project_id', $project_id)->whereIn('bed_id', $bedIds)->where('status', 100)->get(); + $bedIds = Bed::where('area_id', $item->id)->pluck('id'); + $order = Orders::whereIn('bed_id', $bedIds)->where('status', 100)->get(); $item->order_total = $order->sum('total'); $item->lies = $this->getLies($bedIds, $productItem, $factor); } // 获取所有列 $lie = array_column($data[0]->lies, 'name'); - return view($this->bladePath . ".huli", compact("data", "lie","projects","project_id")); + return view($this->bladePath . ".huli", compact("data", "lie", "projects", "project_id")); } /**