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

更新

Browse Source
This commit is contained in:
mkm 2024-01-06 11:07:40 +08:00
parent 570215b220
commit 41555ba42f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/common/Model/Task.php
View File

@ -225,7 +225,7 @@ class Task extends CommonModel
* @throws DbException * @throws DbException
* @throws ModelNotFoundException * @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) { if (!$name) {
return error(1, '请填写任务标题'); return error(1, '请填写任务标题');
@ -289,7 +289,7 @@ class Task extends CommonModel
'pri' => $pri, 'pri' => $pri,
'description' => $description, 'description' => $description,
'begin_time' => $beginTime, '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, 'private' => $project['open_task_private'] ? 1 : 0,
'name' => trim($taskTitle), 'name' => trim($taskTitle),
]; ];

5
application/project/controller/Task.php
View File

@ -155,7 +155,7 @@ class Task extends BasicApi
*/ */
public function save(Request $request) 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'])) { if (!isset($data['assign_to'])) {
$data['assign_to'] = ''; $data['assign_to'] = '';
} }
@ -177,7 +177,8 @@ class Task extends BasicApi
$data['project_code'] = $parentTask['project_code']; $data['project_code'] = $parentTask['project_code'];
$data['stage_code'] = $parentTask['stage_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)) { if (!isError($result)) {
$this->success('', $result); $this->success('', $result);
} }