gx

@@ -26,32 +26,20 @@ use Illuminate\Validation\Rule;
  */
  */
 class TaskController extends BaseController
 class TaskController extends BaseController
 {
 {
-
-    public function list(TaskLogic $logic)
+    /**
+     * @remark :获取工单列表
+     * @name   :list
+     * @author :lyh
+     * @method :post
+     * @time   :2023/8/23 15:11
+     */
+    public function list(Task $task)
     {
     {
-        $map = [];
-        if(!empty($this->param['search']) && !empty($this->param['search_type'])){
-            if($this->param['search_type'] == 'project'){
-                $map[] = ['project_id', 'in', Project::where('title', 'like', "%{$this->param['search']}%")->pluck('id')->toarray()];
-            }else{
-                $map[] = [$this->param['search_type'], 'like', "%{$this->param['search']}%"];
-            }
-        }
-        if(!empty($this->param['dep_id'])){
-            $manage_ids = Manage::where('dept_id', $this->param['dep_id'])->pluck('id')->toArray();
-            $map[] = ['gto.manage_id', 'in', $manage_ids];
-        }
-        if(!empty($this->param['manage_id']) && !empty($this->param['type'])){
-            if($this->param['type'] == 1){
-                $map[] = ['created_manage_id', $this->param['manage_id']];
-            }else{
-                $map[] = ['gto.manage_id', $this->param['manage_id']];
-            }
-        }
-
-        $sort = ['id' => 'desc'];
-        $data = $logic->getUserlist($map, $sort, ['*']);
-        return $this->success($data);
+        //获取所有人员
+        $taskOwnerModel = new TaskOwner();
+        $manager_list = $taskOwnerModel->select('manage_id', DB::raw('COUNT(*) as count'))
+            ->groupBy('manage_id')->get()->toArray();
+        $this->response('success',Code::SUCCESS,$manager_list);
     }
     }
 
 
     public function items(Request $request, TaskLogic $logic)
     public function items(Request $request, TaskLogic $logic)
@@ -86,7 +74,13 @@ class TaskController extends BaseController
         return $this->success($data);
         return $this->success($data);
     }
     }
 
 
-
+    /**
+     * @remark :获取详情
+     * @name   :info
+     * @author :lyh
+     * @method :post
+     * @time   :2023/8/23 15:09
+     */
     public function info(Request $request, TaskLogic $logic){
     public function info(Request $request, TaskLogic $logic){
         $request->validate([
         $request->validate([
             'id'=>'required'
             'id'=>'required'

@@ -97,7 +97,7 @@ class TaskLogic extends BaseLogic
      * @date 2023/4/27
      * @date 2023/4/27
      */
      */
     public function status($id, $status){
     public function status($id, $status){
-        $task = $this::getInfo($id);
+        $task = $this->model->read(['id'=>$id]);
         if(!$task){
         if(!$task){
             $this->fail('任务不存在');
             $this->fail('任务不存在');
         }
         }