From e29a01f61150c82efd880b69378c1ef35be50233 Mon Sep 17 00:00:00 2001 From: sky121113 Date: Fri, 5 Jun 2026 21:50:23 +0800 Subject: [PATCH] =?UTF-8?q?[FIX]=20=E4=BF=AE=E6=AD=A3=E6=A9=9F=E5=8F=B0?= =?UTF-8?q?=E5=A0=B1=E8=A1=A8=E5=9B=A0=20joinSub=20=E6=BC=8F=E6=8E=89?= =?UTF-8?q?=E7=84=A1=E4=BB=98=E8=B2=BB=E7=87=9F=E6=A5=AD=E9=A1=8D=E6=A9=9F?= =?UTF-8?q?=E5=8F=B0=E5=87=BA=E8=B2=A8=E6=95=B8=E9=87=8F=E7=9A=84=E5=95=8F?= =?UTF-8?q?=E9=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Admin/AnalysisController.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Admin/AnalysisController.php b/app/Http/Controllers/Admin/AnalysisController.php index 3ee00b8..d4ce8ce 100644 --- a/app/Http/Controllers/Admin/AnalysisController.php +++ b/app/Http/Controllers/Admin/AnalysisController.php @@ -181,7 +181,7 @@ class AnalysisController extends Controller // 聯結機台與子查詢，取得最終統計資料 $mainQuery = \Illuminate\Support\Facades\DB::table('machines as m') - ->joinSub($salesQuery, 'sq', 'sq.machine_id', '=', 'm.id') + ->leftJoinSub($salesQuery, 'sq', 'sq.machine_id', '=', 'm.id') ->leftJoinSub($dispenseQuery, 'dq', 'dq.machine_id', '=', 'm.id') ->select([ 'm.id as machine_id', @@ -191,7 +191,11 @@ class AnalysisController extends Controller \Illuminate\Support\Facades\DB::raw('CAST(COALESCE(sq.total_sales, 0) as DECIMAL(10,2)) as total_sales'), \Illuminate\Support\Facades\DB::raw('CAST(COALESCE(dq.total_cost, 0) as DECIMAL(10,2)) as total_cost'), \Illuminate\Support\Facades\DB::raw('CAST((COALESCE(sq.total_sales, 0) - COALESCE(dq.total_cost, 0)) as DECIMAL(10,2)) as total_profit') - ]); + ]) + ->where(function($query) { + $query->whereNotNull('sq.total_sales') + ->orWhereNotNull('dq.total_quantity'); + }); if ($effectiveCompanyId) { $mainQuery->where('m.company_id', $effectiveCompanyId);