From e101ec6ebbc15b8ed20af0b15cf34d836a784737 Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Thu, 8 Jun 2023 10:24:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=86=85=E5=AE=B9?=
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     | 4 ++++
 app/Models/AgriculturalBase.php                     | 7 ++++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/AgriculturalBaseController.php b/app/Http/Controllers/AgriculturalBaseController.php
index a4538dc..638e32e 100644
--- a/app/Http/Controllers/AgriculturalBaseController.php
+++ b/app/Http/Controllers/AgriculturalBaseController.php
@@ -25,7 +25,7 @@ class AgriculturalBaseController extends Controller
      */
     public function index(Request $request)
     {
-        $query = AgriculturalBase::with('crops')->filter($request->all())->sort();
+        $query = AgriculturalBase::with(['crops','industry'])->filter($request->all())->sort();
         $list = $query->paginate(Paginator::resolvePerPage('per_page', 20, 50));
 
         return $this->json(AgriculturalBaseResource::collection($list));
diff --git a/app/Http/Resources/AgriculturalBaseResource.php b/app/Http/Resources/AgriculturalBaseResource.php
index c90305b..d3ef00f 100644
--- a/app/Http/Resources/AgriculturalBaseResource.php
+++ b/app/Http/Resources/AgriculturalBaseResource.php
@@ -35,7 +35,11 @@ class AgriculturalBaseResource extends JsonResource
                 return $this->yield_logs_sum_output ?? 0;
             }, 0),
             'industry_key'=>$this->industry_key,
+            'industry_label' => $this->whenLoaded('industry', function () {
+                return $this->industry->name;
+            }, ''),
             'is_blank'=>$this->is_blank ?? 0,
+            'blank_url' => $this->blank_url ?? '',
         ];
     }
 }
diff --git a/app/Models/AgriculturalBase.php b/app/Models/AgriculturalBase.php
index 04630e8..558c3ae 100644
--- a/app/Models/AgriculturalBase.php
+++ b/app/Models/AgriculturalBase.php
@@ -6,6 +6,7 @@ use App\Enums\BaseType;
 use Dcat\Admin\Traits\HasDateTimeFormatter;
 use EloquentFilter\Filterable;
 use Illuminate\Database\Eloquent\Model;
+use Peidikeji\Keywords\Models\Keywords;
 
 class AgriculturalBase extends Model
 {
@@ -22,7 +23,7 @@ class AgriculturalBase extends Model
         'parent_id', 'cultivated',
         'sort',
         'extends',
-        'industry_key','is_blank'
+        'industry_key','is_blank','blank_url',
     ];
 
     public function parent(){
@@ -58,4 +59,8 @@ class AgriculturalBase extends Model
     {
         return $this->hasMany(Device::class, 'agricultural_base_id');
     }
+
+    public function industry(){
+        return $this->belongsTo(Keywords::class, 'industry_key', 'key');
+    }
 }