pdkj
/
lcly-data-admin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix

dev
Jing Li 2023-08-06 15:21:23 +08:00
parent e6141e8297
commit 4fa447fd3f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/ChartController.php
View File

@ -105,7 +105,7 @@ class ChartController extends Controller
$riceShrimpWeeklyPricesTable = (new RiceShrimpWeeklyPrice)->getTable(); $riceShrimpWeeklyPricesTable = (new RiceShrimpWeeklyPrice)->getTable();
$latestPrice = RiceShrimpWeeklyPrice::query() $latestPrice = RiceShrimpWeeklyPrice::query()
->join($keywordsTable, fn ($join) => $join->on("$riceShrimpWeeklyPricesTable.week", '=', "$keywordsTable.key")) ->join($keywordsTable, fn ($join) => $join->on("$riceShrimpWeeklyPricesTable.week", '=', DB::raw("$keywordsTable.key::INTEGER")))
->where("$keywordsTable.type_key", 'weeks-per-year') ->where("$keywordsTable.type_key", 'weeks-per-year')
->latest("$riceShrimpWeeklyPricesTable.year") ->latest("$riceShrimpWeeklyPricesTable.year")
->latest(DB::raw("$keywordsTable.key::INTEGER")) ->latest(DB::raw("$keywordsTable.key::INTEGER"))

2
app/Http/Controllers/WeeksPerYearController.php
View File

@ -12,6 +12,6 @@ class WeeksPerYearController extends Controller
{ {
$keywords = Keywords::where('type_key', 'weeks-per-year')->pluck('name', 'key'); $keywords = Keywords::where('type_key', 'weeks-per-year')->pluck('name', 'key');
return $keywords->map(fn ($item) => ['id' => $item->key, 'name' => $item->name])->values(); return $keywords->map(fn ($name, $key) => ['id' => $key, 'name' => $name])->values();
} }
} }