种植记录id
parent
7281a51b22
commit
d97be45086
|
|
@ -9,7 +9,8 @@ class PlantHarvestLogFilter extends ModelFilter
|
||||||
/**
|
/**
|
||||||
* 所属种植计划
|
* 所属种植计划
|
||||||
*/
|
*/
|
||||||
public function plant($plantId){
|
public function plant($plantId)
|
||||||
|
{
|
||||||
return $this->where('plant_id', $plantId);
|
return $this->where('plant_id', $plantId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,7 @@ class RegionController extends Controller
|
||||||
public function harvests($id, Request $request)
|
public function harvests($id, Request $request)
|
||||||
{
|
{
|
||||||
$info = Region::show()->findOrFail($id);
|
$info = Region::show()->findOrFail($id);
|
||||||
$query = $info->harvests();
|
$query = $info->harvests()->filter($request->all());
|
||||||
$per = $request->input('per_page');
|
$per = $request->input('per_page');
|
||||||
if ($per == -1) {
|
if ($per == -1) {
|
||||||
$list = $query->get();
|
$list = $query->get();
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,13 @@ class PlantHarvestLog extends Model
|
||||||
'harvest_at' => 'datetime:Y-m-d',
|
'harvest_at' => 'datetime:Y-m-d',
|
||||||
];
|
];
|
||||||
|
|
||||||
public function plant(){
|
public function plant()
|
||||||
|
{
|
||||||
return $this->belongsTo(RegionPlantLog::class, 'plant_id');
|
return $this->belongsTo(RegionPlantLog::class, 'plant_id');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function modelFilter()
|
||||||
|
{
|
||||||
|
return \App\Filters\Admin\PlantHarvestLogFilter::class;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue