From 4a71d922a27e48ae5a37f4f10fc7be2aca98c830 Mon Sep 17 00:00:00 2001
From: vilson <545522390@qq.com>
Date: Thu, 24 Jan 2019 17:47:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=B9=E9=87=8F=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E4=BB=BB=E5=8A=A1=E6=89=A7=E8=A1=8C=E8=80=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/application/common.php b/application/common.php
index 3b08588..2e00677 100644
--- a/application/common.php
+++ b/application/common.php
@@ -88,7 +88,7 @@ function error($errno, $message = '')
 {
     return [
         'errno' => $errno,
-        'message' => $message,
+        'msg' => $message,
     ];
 }
 
diff --git a/application/common/Model/Task.php b/application/common/Model/Task.php
index da55aaf..e815bfa 100644
--- a/application/common/Model/Task.php
+++ b/application/common/Model/Task.php
@@ -5,6 +5,9 @@ namespace app\common\Model;
 use function GuzzleHttp\Promise\task;
 use service\DateService;
 use think\Db;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\ModelNotFoundException;
+use think\exception\DbException;
 use think\facade\Hook;
 
 /**
@@ -364,6 +367,20 @@ class Task extends CommonModel
         return $result;
     }
 
+    public function batchAssignTask($taskCodes, $executorCode)
+    {
+        if ($taskCodes) {
+            try {
+                foreach ($taskCodes as $taskCode) {
+                    $this->assignTask($taskCode, $executorCode);
+                }
+            } catch (\Exception $e) {
+                return error(201, $e->getMessage());
+            }
+        }
+        return true;
+    }
+
     /**
      * @param $taskCode
      * @param $comment
diff --git a/application/project/controller/ProjectMember.php b/application/project/controller/ProjectMember.php
index 3b4e68f..1c951db 100644
--- a/application/project/controller/ProjectMember.php
+++ b/application/project/controller/ProjectMember.php
@@ -32,7 +32,7 @@ class ProjectMember extends BasicApi
         $list = $this->model->_list($where, 'is_owner desc');
         if ($list['list']) {
             foreach ($list['list'] as &$item) {
-                $member = Member::where(['code' => $item['member_code']])->field('id,name,avatar,code,email')->find();
+                $member = Member::where(['code' => $item['member_code']])->field('name,avatar,code,email')->find();
                 !$member && $member = [];
                 $member['is_owner'] = $item['is_owner'];
                 $item = $member;
diff --git a/application/project/controller/Task.php b/application/project/controller/Task.php
index f17d483..d8ba322 100644
--- a/application/project/controller/Task.php
+++ b/application/project/controller/Task.php
@@ -210,6 +210,25 @@ class Task extends BasicApi
         $this->error("操作失败，请稍候再试！");
     }
 
+
+    /**
+     * 批量
+     * 指派任务
+     * @param Request $request
+     */
+    public function batchAssignTask(Request $request)
+    {
+        $taskCodes = $request::param('taskCodes');
+        $executorCode = $request::param('executorCode');
+        if ($taskCodes) {
+            $result = $this->model->batchAssignTask(json_decode($taskCodes), $executorCode);
+            if (isError($result)) {
+                $this->error($result['msg'], $result['errno']);
+            }
+        }
+        $this->success();
+    }
+
     /**
      * 排序
      * @param Request $request