From 3d916ac1530354bfbcbdded6bdb96b6ad732202f Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sat, 26 Aug 2023 16:52:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/TaskController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php index b5259e16d..a2771f5b7 100644 --- a/app/api/controller/TaskController.php +++ b/app/api/controller/TaskController.php @@ -26,8 +26,6 @@ class TaskController extends BaseApiController $where[] = ['director_uid', '=', $this->userId]; } $where[] = ['company_id', '=', $this->userInfo['company_id']]; - - // $where[]=['status','in',[1,2,3,5]]; } if (isset($param['date_time']) && $param['date_time'] != '') { $time = strtotime($param['date_time']); @@ -53,9 +51,11 @@ class TaskController extends BaseApiController 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(); // 可能要判断预存金是否满足 + halt($company->toArray(),$param); $find = App(RemoteController::class)->shang_date_total_price($company,1,$param); if ($find != false) { $res[$k]['extend']['transaction'] = $find; + Task::where('id',$item['id'])->update(['extend'=>json_encode(['transaction'=>$find],true)]); } else { $res[$k]['extend']['transaction'] = ''; }