From 4dc454bd8aeb798491b70522374a4c953399a7e9 Mon Sep 17 00:00:00 2001 From: Jing Li Date: Tue, 16 Apr 2024 15:06:54 +0800 Subject: [PATCH] Update --- app/Http/Controllers/Api/StatisticsController.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Api/StatisticsController.php b/app/Http/Controllers/Api/StatisticsController.php index 844176c..161c242 100644 --- a/app/Http/Controllers/Api/StatisticsController.php +++ b/app/Http/Controllers/Api/StatisticsController.php @@ -16,9 +16,9 @@ class StatisticsController extends Controller */ public function dashboard(Request $request, StatisticService $statisticService): array { - $query = Ledger::filter( - $this->defaultFilterInput($request), LedgerFilter::class - ); + $input = $this->defaultFilterInput($request); + + $query = Ledger::filter($input, LedgerFilter::class); // 昨天 $yesterday = Carbon::yesterday(); @@ -52,7 +52,9 @@ class StatisticsController extends Controller ], // 近30天趋势数据 'trend_data_of_30days' => $statisticService->ledgerTrends( - $yesterday->copy()->subDays(29), $yesterday->copy() + $yesterday->copy()->subDays(29), + $yesterday->copy(), + $input, ), ]; }