From 893449ab6c04f7f896992909b8f9a245cb02ab58 Mon Sep 17 00:00:00 2001
From: vilson <545522390@qq.com>
Date: Wed, 4 Mar 2020 09:52:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=BB=E5=8A=A1=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: vilson <545522390@qq.com>
---
 application/common/Model/Task.php       | 13 ++++++++++++-
 application/project/behavior/Task.php   |  4 ++++
 application/project/controller/Task.php |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/application/common/Model/Task.php b/application/common/Model/Task.php
index 13626ab..772bd86 100644
--- a/application/common/Model/Task.php
+++ b/application/common/Model/Task.php
@@ -19,7 +19,7 @@ use think\facade\Hook;
  */
 class Task extends CommonModel
 {
-    protected $append = ['priText', 'liked', 'stared', 'tags', 'childCount', 'hasUnDone', 'parentDone', 'hasComment', 'hasSource', 'canRead'];
+    protected $append = ['priText','statusText', 'liked', 'stared', 'tags', 'childCount', 'hasUnDone', 'parentDone', 'hasComment', 'hasSource', 'canRead'];
 
     public function read($code)
     {
@@ -112,6 +112,9 @@ class Task extends CommonModel
         if (isset($data['pri'])) {
             $type = 'pri';
         }
+        if (isset($data['status'])) {
+            $type = 'status';
+        }
         if (isset($data['begin_time'])) {
             $type = 'setBeginTime';
             if (!$data['begin_time']) {
@@ -720,6 +723,14 @@ class Task extends CommonModel
         $status = [0 => '普通', 1 => '紧急', 2 => '非常紧急'];
         return $status[$data['pri']];
     }
+    public function getStatusTextAttr($value, $data)
+    {
+        if (!isset($data['status'])) {
+            $data['status'] = 0;
+        }
+        $status = [0 => '未开始', 1 => '已完成', 2 => '进行中', 3 => '挂起', 4 => '测试中'];
+        return $status[$data['status']];
+    }
 
     /**
      * 标签
diff --git a/application/project/behavior/Task.php b/application/project/behavior/Task.php
index 0174c10..5a82552 100644
--- a/application/project/behavior/Task.php
+++ b/application/project/behavior/Task.php
@@ -118,6 +118,10 @@ class Task
                 $icon = 'user';
                 $remark = '更新任务优先级为 ' . $task['priText'];
                 break;
+            case 'status':
+                $icon = 'deployment-unit';
+                $remark = '修改执行状态为 ' . $task['statusText'];
+                break;
             case 'removeExecutor':
                 $icon = 'user-delete';
                 $remark = '移除了执行者 ';
diff --git a/application/project/controller/Task.php b/application/project/controller/Task.php
index 4b1001d..4d6ce8e 100644
--- a/application/project/controller/Task.php
+++ b/application/project/controller/Task.php
@@ -294,7 +294,7 @@ class Task extends BasicApi
      */
     public function edit(Request $request)
     {
-        $data = $request::only('name,sort,end_time,begin_time,pri,description,work_time');
+        $data = $request::only('name,sort,end_time,begin_time,pri,description,work_time,status');
         $code = $request::post('taskCode');
         if (!$code) {
             $this->error("请选择一个任务");