gx

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Aside\Task;
 
 
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Controllers\Aside\BaseController;
+use App\Http\Logic\Aside\Manage\ManageLogic;
 use App\Http\Logic\Aside\Task\TaskFollowLogic;
 use App\Http\Logic\Aside\Task\TaskFollowLogic;
 use App\Http\Logic\Aside\Task\TaskLogic;
 use App\Http\Logic\Aside\Task\TaskLogic;
 use App\Http\Logic\Aside\Task\TaskOwnerLogic;
 use App\Http\Logic\Aside\Task\TaskOwnerLogic;
@@ -36,11 +37,20 @@ class TaskController extends BaseController
      */
      */
     public function list(Task $task)
     public function list(Task $task)
     {
     {
+        $lists = [];
         //获取所有人员
         //获取所有人员
         $taskOwnerModel = new TaskOwner();
         $taskOwnerModel = new TaskOwner();
         $manager_list = $taskOwnerModel->select('manage_id', DB::raw('COUNT(*) as count'))
         $manager_list = $taskOwnerModel->select('manage_id', DB::raw('COUNT(*) as count'))
             ->groupBy('manage_id')->get()->toArray();
             ->groupBy('manage_id')->get()->toArray();
-        $this->response('success',Code::SUCCESS,$manager_list);
+        $managerModel = new Manage();
+        foreach ($manager_list as $k => $v){
+            $ids = $taskOwnerModel->where('manage_id', $v['manage_id'])->pluck('task_id')->toArray();
+            $lists['manager_id'] = $v['manage_id'];
+            $lists["manage_id_text"] = $managerModel->read(['id'=>$v['manage_id']])['name'];
+            $lists["count"] = $v['count'];
+            $lists['task_list'] = $task->list(['id'=>['in',$ids]]);
+        }
+        $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 
     public function items(Request $request, TaskLogic $logic)
     public function items(Request $request, TaskLogic $logic)