From 03f8cf9c397061a683938b14299933aa054008d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=9D=99?= Date: Wed, 17 May 2023 10:05:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E6=96=B0=E5=91=A8=E7=A8=BB=E8=99=BE?= =?UTF-8?q?=E4=BB=B7=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/ChartController.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/app/Http/Controllers/ChartController.php b/app/Http/Controllers/ChartController.php index 6a039d2..a401196 100644 --- a/app/Http/Controllers/ChartController.php +++ b/app/Http/Controllers/ChartController.php @@ -10,6 +10,7 @@ use App\Models\RiceShrimpPrice; use App\Models\RiceShrimpWeeklyPrice; use Peidikeji\Keywords\Models\Keywords; use Illuminate\Http\Request; +use Illuminate\Support\Facades\DB; class ChartController extends Controller { @@ -99,7 +100,19 @@ class ChartController extends Controller ]; }); + $keywordsTable = (new Keywords())->getTable(); + + $riceShrimpWeeklyPricesTable = (new RiceShrimpWeeklyPrice)->getTable(); + + $latestPrice = RiceShrimpWeeklyPrice::query() + ->join($keywordsTable, fn ($join) => $join->on("$riceShrimpWeeklyPricesTable.week", '=', "$keywordsTable.id")) + ->where("$keywordsTable.type_key", 'weeks-per-year') + ->latest("$riceShrimpWeeklyPricesTable.year") + ->latest(DB::raw("$keywordsTable.key::INTEGER")) + ->value("$riceShrimpWeeklyPricesTable.price"); + return [ + 'c_price' => $latestPrice, 'c_week' => ($now->month - 1) * 4 + ($now->weekOfMonth > 4 ? 4 : $now->weekOfMonth), 'x_axis' => $weeks->values(), 'series' => $series->sortKeys()->values()->all(),