diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php index 6cd59ee14..ac39e46e8 100644 --- a/app/api/controller/TaskController.php +++ b/app/api/controller/TaskController.php @@ -15,6 +15,15 @@ class TaskController extends BaseApiController{ $where[]=['director_uid','=',$this->userId]; $where[]=['status','=',1]; } + if(isset($param['date_time']) && $param['date_time']!=''){ + $time=strtotime($param['date_time']); + $end=$time+86399; + $where[]=['start_time','between',[$time,$end]]; + }else{ + $time=strtotime(date('Y-m-d')); + $end=$time+86399; + $where[]=['start_time','between',[$time,$end]]; + } $res=Task::where($where) ->field(['id', 'title','money','template_id','director_uid', 'company_id', 'start_time', 'end_time', 'director_uid', 'type', 'status', 'content','extend']) ->page($page,25) diff --git a/app/job/TaskInformationJob.php b/app/job/TaskInformationJob.php index 7216d4951..fd9ab846b 100644 --- a/app/job/TaskInformationJob.php +++ b/app/job/TaskInformationJob.php @@ -41,7 +41,7 @@ class TaskInformationJob return false; } }else{ - $task_count = Task::where('id', $data['task_id'])->field('director_uid')->with('director_info')->find(); + $task_count = Task::where('id', $data['task_id'])->field('director_uid')->where('status',3)->with('director_info')->find(); if (empty($task_count)) { Log::error('任务结算失败,任务id:' . $data['task_id']); return false; @@ -52,11 +52,6 @@ class TaskInformationJob } if ($data['template_info']['type'] == 32) { $yesterday = date('Y-m-d', strtotime('-1 day', time())); - // "brigade_id" => "3", - // "city_code" => "510500", - // "district_code" => "510502", - // "street_code" => "510502106", - // "village_code" => "510502106201", $parmas = [ "start_date" => $yesterday, "end_date" => $yesterday