From 8eb0fa4aaeb8da8ba01927f5faf1a896a23fd2a6 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 8 Jan 2024 10:44:39 +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 --- application/common/Model/Task.php | 30 ++++++++++++++++++++++++- application/project/controller/Task.php | 4 ++-- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/application/common/Model/Task.php b/application/common/Model/Task.php index d855603..28a5824 100755 --- a/application/common/Model/Task.php +++ b/application/common/Model/Task.php @@ -21,6 +21,22 @@ class Task extends CommonModel { protected $append = ['priText', 'statusText', 'liked', 'stared', 'tags', 'childCount', 'hasUnDone', 'parentDone', 'hasComment', 'hasSource', 'canRead']; + public function getExchangeListAttr($value) + { + if($value){ + return explode(',',$value); + }else{ + return[]; + } + } + public function getTransferredtAttr($value) + { + if($value){ + return explode(',',$value); + }else{ + return[]; + } + } public function read($code) { if (!$code) { @@ -435,7 +451,7 @@ class Task extends CommonModel * @throws DbException * @throws ModelNotFoundException */ - public function createComment($taskCode, $comment, $mentions = []) + public function createComment($taskCode, $comment, $mentions = [],$type=0) { if (!$taskCode) { throw new Exception('请选择任务', 1); @@ -455,6 +471,18 @@ class Task extends CommonModel // 'type' => 'comment' // ]; self::taskHook(getCurrentMember()['code'], $taskCode, 'comment', '', 1, '', $comment, '', $mentions); + if($type==1){ + $data['status']=2; + if($task['exchange_list']){ + $task['transferred'][]=$task['exchange_list'][0]; + $task['assign_to']=$task['exchange_list'][0]; + unset($task['exchange_list'][0]); + Db::name('task')->where('id',$task['id'])->update($data); + } + }elseif($type==2){ + $data['status']=2; + Db::name('task')->where('id',$task['id'])->update($data); + } return true; // return ProjectLog::create($data); } diff --git a/application/project/controller/Task.php b/application/project/controller/Task.php index 20dd6c9..08e5932 100755 --- a/application/project/controller/Task.php +++ b/application/project/controller/Task.php @@ -270,7 +270,7 @@ class Task extends BasicApi */ public function createComment(Request $request) { - $data = $request::only('taskCode,comment,mentions'); + $data = $request::only('taskCode,comment,mentions,type'); if (!$request::post('taskCode')) { $this->error("请选择任务"); } @@ -278,7 +278,7 @@ class Task extends BasicApi $data['mentions'] = json_decode($data['mentions']); } try { - $result = $this->model->createComment($data['taskCode'], $data['comment'], $data['mentions']); + $result = $this->model->createComment($data['taskCode'], $data['comment'], $data['mentions'],$data['type']); } catch (Exception $e) { $this->error($e->getMessage(), $e->getCode());; }