diff --git a/application/common/Model/Task.php b/application/common/Model/Task.php index aca9c09..b3d559d 100755 --- a/application/common/Model/Task.php +++ b/application/common/Model/Task.php @@ -225,7 +225,7 @@ class Task extends CommonModel * @throws DbException * @throws ModelNotFoundException */ - public function createTask($stageCode, $projectCode, $name, $memberCode, $assignTo = '', $parentCode = '', $pri = '', $description = '', $tagCodes = [], $beginTime = '', $endTime = '') + public function createTask($stageCode, $projectCode, $name, $memberCode, $assignTo = '', $parentCode = '', $pri = '', $description = '', $tagCodes = [], $beginTime = '', $endTime = '',$data) { if (!$name) { return error(1, '请填写任务标题'); @@ -289,7 +289,7 @@ class Task extends CommonModel 'pri' => $pri, 'description' => $description, 'begin_time' => $beginTime, - 'end_time' => $endTime, + 'end_time' => date('Y-m-d H:i:s',bcdiv($endTime,1000)), 'private' => $project['open_task_private'] ? 1 : 0, 'name' => trim($taskTitle), ]; diff --git a/application/project/controller/Task.php b/application/project/controller/Task.php index 9ddcec1..196f110 100755 --- a/application/project/controller/Task.php +++ b/application/project/controller/Task.php @@ -155,7 +155,7 @@ class Task extends BasicApi */ public function save(Request $request) { - $data = $request::only('name,stage_code,project_code,assign_to,pcode'); + $data = $request::only('name,stage_code,project_code,assign_to,pcode,exchangeList,description,end_time,pri,executor'); if (!isset($data['assign_to'])) { $data['assign_to'] = ''; } @@ -177,7 +177,8 @@ class Task extends BasicApi $data['project_code'] = $parentTask['project_code']; $data['stage_code'] = $parentTask['stage_code']; } - $result = $this->model->createTask($data['stage_code'], $data['project_code'], $data['name'], $member['code'], $data['assign_to'], $data['pcode']); + $result = $this->model->createTask($data['stage_code'], $data['project_code'], $data['name'], $member['code'], + $data['assign_to'], $data['pcode'],$data['pri'],$data['description'],'',date('Y-m-d H:i:s'),$data['end_time'],$data); if (!isError($result)) { $this->success('', $result); }