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

补充内容

dev
vine_liutk 2023-06-08 10:24:16 +08:00
parent 5d4610f818
commit e101ec6ebb
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,7 @@ class AgriculturalBaseController extends Controller
*/ */
public function index(Request $request) 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)); $list = $query->paginate(Paginator::resolvePerPage('per_page', 20, 50));
return $this->json(AgriculturalBaseResource::collection($list)); return $this->json(AgriculturalBaseResource::collection($list));

4
app/Http/Resources/AgriculturalBaseResource.php
View File

@ -35,7 +35,11 @@ class AgriculturalBaseResource extends JsonResource
return $this->yield_logs_sum_output ?? 0; return $this->yield_logs_sum_output ?? 0;
}, 0), }, 0),
'industry_key'=>$this->industry_key, 'industry_key'=>$this->industry_key,
'industry_label' => $this->whenLoaded('industry', function () {
return $this->industry->name;
}, ''),
'is_blank'=>$this->is_blank ?? 0, 'is_blank'=>$this->is_blank ?? 0,
'blank_url' => $this->blank_url ?? '',
]; ];
} }
} }

7
app/Models/AgriculturalBase.php
View File

@ -6,6 +6,7 @@ use App\Enums\BaseType;
use Dcat\Admin\Traits\HasDateTimeFormatter; use Dcat\Admin\Traits\HasDateTimeFormatter;
use EloquentFilter\Filterable; use EloquentFilter\Filterable;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Peidikeji\Keywords\Models\Keywords;
class AgriculturalBase extends Model class AgriculturalBase extends Model
{ {
@ -22,7 +23,7 @@ class AgriculturalBase extends Model
'parent_id', 'cultivated', 'parent_id', 'cultivated',
'sort', 'sort',
'extends', 'extends',
'industry_key','is_blank' 'industry_key','is_blank','blank_url',
]; ];
public function parent(){ public function parent(){
@ -58,4 +59,8 @@ class AgriculturalBase extends Model
{ {
return $this->hasMany(Device::class, 'agricultural_base_id'); return $this->hasMany(Device::class, 'agricultural_base_id');
} }
public function industry(){
return $this->belongsTo(Keywords::class, 'industry_key', 'key');
}
} }