删除无用的注释和文件

app/Gdoo/Project/Controllers/ProjectController.php

@@ -75,7 +75,7 @@ class ProjectController extends DefaultController
         ]);
     }
 
-    // 项目显示
+    // 项目详情
     public function showAction(Request $request)
     {
         return $this->display([]);

app/Gdoo/Project/Controllers/TaskController.php

@@ -14,6 +14,8 @@ use Gdoo\Project\Models\Item;
 use Gdoo\Project\Models\Log;
 use Gdoo\Index\Models\Attachment;
 
+use Gdoo\Project\Services\TaskService;
+
 use Gdoo\Index\Controllers\DefaultController;
 use Gdoo\Index\Services\AttachmentService;
 use Illuminate\Support\Arr;
@@ -36,7 +38,7 @@ class TaskController extends DefaultController
         $query = $search['query'];
 
         if ($request->ajax() && $request->wantsJson()) {
-            $tasks = $this->data($search);
+            $tasks = TaskService::data($search);
             $_tasks = array_nest($tasks, 'name');
             $rows = [];
             foreach($_tasks as $_task) {
@@ -47,7 +49,7 @@ class TaskController extends DefaultController
         }
 
         if ($request->ajax()) {
-            $tasks = $this->data($search);
+            $tasks = TaskService::data($search);
             return response()->json(['data' => $tasks]);
         }
         
@@ -73,114 +75,6 @@ class TaskController extends DefaultController
         ], 'index/'.$query['tpl']);
     }
 
-    // 读取数据
-    public function data($search)
-    {
-        $query = $search['query'];
-
-        $user_id = auth()->id();
-
-        $_items = Task::where('project_id', $query['project_id'])
-        ->leftJoin('project', 'project.id', '=', 'project_task.project_id')
-        ->where('parent_id', 0)
-        ->orderBy('project_task.sort', 'asc')
-        ->orderBy('project_task.id', 'asc')
-        ->get(['project_task.*', 'project.user_id as project_user_id'])->toArray();
-
-        $model = Task::with(['users' => function ($q) {
-            $q->select(['user.id','user.name as user_name']);
-        }]);
-
-        $model->where('project_task.project_id', $query['project_id'])
-        ->leftJoin('project', 'project.id', '=', 'project_task.project_id')
-        ->leftJoin('user', 'user.id', '=', 'project_task.user_id')
-        ->where('parent_id', '>', 0);
-        
-        foreach ($search['where'] as $where) {
-            if ($where['active']) {
-                $model->search($where);
-            }
-        }
-        $_tasks = $model->select(['project_task.*','user.name as user_name', 'project.user_id as project_user_id'])
-        ->orderBy('project_task.sort', 'asc')
-        ->orderBy('project_task.id', 'asc')
-        ->get()->toArray();
-
-        foreach ($_items as $_item) {
-            $project_user_id = 0;
-            if ($_item['project_user_id'] == $user_id) {
-                $project_user_id = 1;
-            }
-            
-            $tasks[] = [
-                'start_date' => '',
-                'parent_id' => 0,
-                'parent' => 0,
-                'duration' => '',
-                'loaded' => true,
-                'expanded' => true,
-                'id' => $_item['id'],
-                'name' => $_item['name'],
-                'type' => $_item['type'],
-                'created_at' => '',
-                'user_id' => 0,
-                'user_name' => '',
-                'open' => true,
-                'option_edit' => $project_user_id,
-                'option_delete' => $project_user_id,
-                'dhm' => '',
-            ];
-        }
-
-        foreach ($_tasks as $_task) {
-            $project_user_id = $task_user_id = 0;
-
-            if ($_task['user_id'] == $user_id) {
-                $task_user_id = 1;
-            }
-
-            // 显示保存按钮
-            if ($_task['project_user_id'] == $user_id) {
-                $task_user_id = $project_user_id = 1;
-            }
-
-            $_task['option_edit'] = $task_user_id;
-            $_task['option_delete'] = $project_user_id;
-
-            $_task['start_date'] = date('Y-m-d', $_task['start_at']);
-            $_task['name'] = $_task['name'];
-            $_task['parent'] = $_task['parent_id'];
-            $_task['users'] = join(',', Arr::pluck($_task['users'], 'user_name'));
-            $_task['open'] = true;
-            $_task['loaded'] = true;
-            $_task['expanded'] = true;
-            $_task['created_dt'] = format_datetime($_task['created_at']);
-            $_task['start_dt'] = format_datetime($_task['start_at']);
-            $_task['end_dt'] = format_datetime($_task['end_at']);
-
-            if ($_task['start_at'] && $_task['end_at']) {
-                $remain = remain_time($_task['start_at'], $_task['end_at'], '');
-                $str = '';
-                if ($remain->d) {
-                    $str .= $remain->d.'天';
-                }
-                if ($remain->h) {
-                    $str .= $remain->h.'小时';
-                }
-                if ($remain->i) {
-                    $str .= $remain->i.'分钟';
-                }
-                $_task['duration_date'] = $str;
-            }
-
-            $_task['duration'] = ($_task['end_at'] - $_task['start_at']) / 86400;
-            $_task['duration'] = $_task['duration'] > 0 ? $_task['duration'] : 1;
-
-            $tasks[] = $_task;
-        }
-        return $tasks;
-    }
-
     // 显示任务
     public function showAction(Request $request)
     {