weiz
/
suyuan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '操作列表接口修改' (#28) from zhangwei into dev 

Reviewed-on: #28
This commit is contained in:
weiz 2023-11-29 17:16:25 +08:00
parent 56f5d9f570 26b4fbebc6
commit 628b5ee2e4
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/api/controller/ActionController.php
View File

@ -99,10 +99,18 @@
if(empty($params['plant_id'])){
return $this->fail('缺少必要参数');
}
$data = Action::where('plant_id',$params['plant_id'])->order('create_time asc')->select()->each(function($item){
$item['detail'] = json_decode($item['detail'],true);
return $item;
})->toArray();
$data = Db::query("SELECT * FROM zzsy_land_plant_action WHERE id IN (SELECT max( id ) FROM zzsy_land_plant_action WHERE plant_id = {$params['plant_id']} GROUP BY type)");
return $this->success('请求成功',$data);
}
//单一操作列表
public function listForType(): Json
{
$params = $this->request->get(['plant_id','type']);
if(empty($params['plant_id']) || empty($params['type'])){
return $this->fail('缺少必要参数');
}
$data = Action::where('plant_id',$params['plant_id'])->where('type',$params['type'])->select()->toArray();
return $this->success('请求成功',$data);
}
}

9
app/api/controller/LandController.php
View File

@ -48,6 +48,15 @@
if($data->isEmpty()){
return $this->fail('土地信息不存在');
}
if($data['user_id'] != $this->userId){
return $this->fail('土地信息与用户信息不匹配');
}
$landProduct = LandProduct::where('land_id',$params['land_id'])->findOrEmpty();
if($landProduct->isEmpty()){
$data['is_bind_product'] = 0;
}else{
$data['is_bind_product'] = 1;
}
$data['pic'] = json_decode($data['pic'],true);
return $this->success('请求成功',$data->toArray());
}