mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交修复

Browse Source
This commit is contained in:
mkm 2023-08-16 15:54:30 +08:00
parent 4f40469615
commit 0dcccba2a8
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/api/controller/TaskController.php
View File

@ -38,17 +38,18 @@ class TaskController extends BaseApiController{
->field(['id', 'title','money','template_id','director_uid', 'company_id', 'start_time', 'end_time', 'director_uid', 'type', 'status', 'content','extend']) ->field(['id', 'title','money','template_id','director_uid', 'company_id', 'start_time', 'end_time', 'director_uid', 'type', 'status', 'content','extend'])
->page($page,25) ->page($page,25)
->order(['id' => 'desc','status'=>'asc']) ->order(['id' => 'desc','status'=>'asc'])
->select()->each(function($item){ ->select()->toArray();
if($item->type==33){ foreach($res as $k=>$item){
if($item['type']==33){
$company = Company::where('id', $item['company_id'])->field('id,deposit,company_money,user_id,day_count,company_type,province,city,area,street,village,brigade')->find(); // 可能要判断预存金是否满足 $company = Company::where('id', $item['company_id'])->field('id,deposit,company_money,user_id,day_count,company_type,province,city,area,street,village,brigade')->find(); // 可能要判断预存金是否满足
$res=App(RemoteController::class)->shang_date_total_price($company); $find=App(RemoteController::class)->shang_date_total_price($company);
if($res!=false){ if($find!=false){
$item->extend['transaction']=$res; $res[$k]['extend']['transaction']=$find;
}else{ }else{
$item->extend['transaction']=''; $res[$k]['extend']['transaction']='';
}
} }
} }
})->toArray();
return $this->success('ok', $res); return $this->success('ok', $res);
} }
} }