更新
This commit is contained in:
parent
9122fa5e32
commit
3694306277
@ -15,6 +15,15 @@ class TaskController extends BaseApiController{
|
|||||||
$where[]=['director_uid','=',$this->userId];
|
$where[]=['director_uid','=',$this->userId];
|
||||||
$where[]=['status','=',1];
|
$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)
|
$res=Task::where($where)
|
||||||
->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)
|
||||||
|
@ -41,7 +41,7 @@ class TaskInformationJob
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}else{
|
}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)) {
|
if (empty($task_count)) {
|
||||||
Log::error('任务结算失败,任务id:' . $data['task_id']);
|
Log::error('任务结算失败,任务id:' . $data['task_id']);
|
||||||
return false;
|
return false;
|
||||||
@ -52,11 +52,6 @@ class TaskInformationJob
|
|||||||
}
|
}
|
||||||
if ($data['template_info']['type'] == 32) {
|
if ($data['template_info']['type'] == 32) {
|
||||||
$yesterday = date('Y-m-d', strtotime('-1 day', time()));
|
$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 = [
|
$parmas = [
|
||||||
"start_date" => $yesterday,
|
"start_date" => $yesterday,
|
||||||
"end_date" => $yesterday
|
"end_date" => $yesterday
|
||||||
|
Loading…
x
Reference in New Issue
Block a user