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

update

This commit is contained in:
weiz 2023-10-28 17:48:47 +08:00
parent 1b07c909b1
commit 17d3d2598f
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -191,14 +191,17 @@
public function fishRecordList(): Json public function fishRecordList(): Json
{ {
//获取参数 //获取参数
$params = $this->request->get(['pond_id','page_no','page_size']); $params = $this->request->get(['pond_id','action_type_id','page_no','page_size']);
if(empty($params['pond_id'])){ if(empty($params['pond_id']) || empty($params['action_type_id'])){
return $this->fail('参数错误'); return $this->fail('参数错误');
} }
//设置分页条件 //设置分页条件
$pageNo = empty($params['page_no']) || $params['page_no'] < 0 ? 1 : $params['page_no']; $pageNo = empty($params['page_no']) || $params['page_no'] < 0 ? 1 : $params['page_no'];
$pageSize = empty($params['page_size']) || $params['page_size'] < 0 ? 10 : $params['page_size']; $pageSize = empty($params['page_size']) || $params['page_size'] < 0 ? 10 : $params['page_size'];
$data = Db::name('farmer_pond_record')->where('pond_id',$params['pond_id'])->page($pageNo,$pageSize)->order('create_time desc')->select()->each(function($item){ //获取操作分类下的操作id
$actions = Db::name('farmer_action')->where('type_id',$params['action_type_id'])->select()->toArray();
$actionIds = array_column($actions,'id');
$data = Db::name('farmer_pond_record')->where('pond_id',$params['pond_id'])->where('action_id','in',$actionIds)->page($pageNo,$pageSize)->order('create_time desc')->select()->each(function($item){
$item['action_name'] = Db::name('farmer_action')->where('id',$item['action_id'])->findOrEmpty()['name']; $item['action_name'] = Db::name('farmer_action')->where('id',$item['action_id'])->findOrEmpty()['name'];
$item['action_content'] = json_decode($item['action_content'],true); $item['action_content'] = json_decode($item['action_content'],true);
$item['create_time'] = date('Y-m-d H:i:s',$item['create_time']); $item['create_time'] = date('Y-m-d H:i:s',$item['create_time']);

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

@ -192,14 +192,17 @@
public function landCropRecordList(): Json public function landCropRecordList(): Json
{ {
//获取参数 //获取参数
$params = $this->request->get(['crop_id','page_no','page_size']); $params = $this->request->get(['crop_id','action_type_id','page_no','page_size']);
if(empty($params['crop_id'])){ if(empty($params['crop_id']) || empty($params['action_type_id'])){
return $this->fail('参数错误'); return $this->fail('参数错误');
} }
//设置分页条件 //设置分页条件
$pageNo = empty($params['page_no']) || $params['page_no'] < 0 ? 1 : $params['page_no']; $pageNo = empty($params['page_no']) || $params['page_no'] < 0 ? 1 : $params['page_no'];
$pageSize = empty($params['page_size']) || $params['page_size'] < 0 ? 10 : $params['page_size']; $pageSize = empty($params['page_size']) || $params['page_size'] < 0 ? 10 : $params['page_size'];
$data = Db::name('farmer_land_crop_record')->where('crop_id',$params['crop_id'])->page($pageNo,$pageSize)->order('create_time desc')->select()->each(function($item){ //获取操作分类下的操作id
$actions = Db::name('farmer_action')->where('type_id',$params['action_type_id'])->select()->toArray();
$actionIds = array_column($actions,'id');
$data = Db::name('farmer_land_crop_record')->where('crop_id',$params['crop_id'])->where('action_id','in',$actionIds)->page($pageNo,$pageSize)->order('create_time desc')->select()->each(function($item){
$item['action_name'] = Db::name('farmer_action')->where('id',$item['action_id'])->findOrEmpty()['name']; $item['action_name'] = Db::name('farmer_action')->where('id',$item['action_id'])->findOrEmpty()['name'];
$item['action_content'] = json_decode($item['action_content'],true); $item['action_content'] = json_decode($item['action_content'],true);
$item['create_time'] = date('Y-m-d H:i:s',$item['create_time']); $item['create_time'] = date('Y-m-d H:i:s',$item['create_time']);