liutk
/
internet-everythings-agricultural
1
0
Fork 0
Code Releases Activity

Compare commits

base: liutk:2660bd86bc3fdcd6ffef533176173b8aba6aabd6
Branches Tags
liutk:main
liutk:develop
..
compare: liutk:d701d25b060fb3510e5bdaf3738f4e3f9bf42f67
Branches Tags
liutk:main
liutk:develop

No commits in common. "2660bd86bc3fdcd6ffef533176173b8aba6aabd6" and "d701d25b060fb3510e5bdaf3738f4e3f9bf42f67" have entirely different histories.
2660bd86bc ... d701d25b06

3 changed files with 3 additions and 10 deletions
Show Stats Expand all files Collapse all files

3
app/Filters/Admin/PlantHarvestLogFilter.php
View File

@ -9,8 +9,7 @@ class PlantHarvestLogFilter extends ModelFilter
/** /**
* 所属种植计划 * 所属种植计划
*/ */
public function plant($plantId) public function plant($plantId){
{
return $this->where('plant_id', $plantId); return $this->where('plant_id', $plantId);
} }
} }

2
app/Http/Controllers/Api/RegionController.php
View File

@ -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()->filter($request->all()); $query = $info->harvests();
$per = $request->input('per_page'); $per = $request->input('per_page');
if ($per == -1) { if ($per == -1) {
$list = $query->get(); $list = $query->get();

8
app/Models/PlantHarvestLog.php
View File

@ -13,13 +13,7 @@ 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;
}
} }