From 62d56f0358e234cec9534c7a6288b92016194619 Mon Sep 17 00:00:00 2001 From: weizong song Date: Mon, 2 Mar 2026 16:03:21 +0800 Subject: [PATCH] up --- app/Http/Controllers/Admin/StatisticsController.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Admin/StatisticsController.php b/app/Http/Controllers/Admin/StatisticsController.php index ab65660..ed3b59d 100755 --- a/app/Http/Controllers/Admin/StatisticsController.php +++ b/app/Http/Controllers/Admin/StatisticsController.php @@ -370,8 +370,13 @@ class StatisticsController extends CommonController }) ->whereNull("orders.deleted_at") ->where("orders.project_id", $project_id) - ->whereDate("orders.from_date", "<=", $before_date) - ->whereDate("orders.to_date", ">=", $before_date) + ->whereExists(function ($query) use ($before_date) { + $query->select(DB::raw(1)) + ->from('order_items') + ->whereColumn('order_items.order_id', 'orders.id') + ->whereNull('order_items.deleted_at') + ->whereDate('order_items.service_date', $before_date); + }) ->groupBy( "orders.id", "orders.serial",