From ae07d3b3bd0797eb68cc2c61a335495aba170d17 Mon Sep 17 00:00:00 2001 From: vine_liutk <961510893@qq.com> Date: Fri, 26 May 2023 16:17:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9F=BA=E5=9C=B0=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=B7=BB=E5=8A=A0=E7=BB=9F=E8=AE=A1=E6=80=BB=E4=BA=A7?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/AgriculturalBaseController.php | 2 +- app/Http/Resources/AgriculturalBaseResource.php | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/AgriculturalBaseController.php b/app/Http/Controllers/AgriculturalBaseController.php index 2a28a2e..a4538dc 100644 --- a/app/Http/Controllers/AgriculturalBaseController.php +++ b/app/Http/Controllers/AgriculturalBaseController.php @@ -63,7 +63,7 @@ class AgriculturalBaseController extends Controller public function show(AgriculturalBase $agriculturalBasic) { - $agriculturalBasic->load(['crops', 'devices']); + $agriculturalBasic->load(['crops', 'devices', 'yieldLogs'])->loadSum('yieldLogs', 'output'); return $this->json(AgriculturalBaseResource::make($agriculturalBasic)); } diff --git a/app/Http/Resources/AgriculturalBaseResource.php b/app/Http/Resources/AgriculturalBaseResource.php index c95a933..27e3bcc 100644 --- a/app/Http/Resources/AgriculturalBaseResource.php +++ b/app/Http/Resources/AgriculturalBaseResource.php @@ -31,6 +31,9 @@ class AgriculturalBaseResource extends JsonResource 'parent_id' => $this->parent_id ?? 0, 'sort' => $this->sort ?? 0, 'extends' => json_decode($this->extends ?? '') ?? [], + 'total_output' => $this->whenLoaded('yieldLogs', function () { + return $this->yield_logs_sum_output ?? 0; + }, 0), ]; } }