Browse Source

部门,计划,项目,需求,任务,用户列表都加上通过创建日期排序

kely 9 months ago
parent
commit
ba72179d1f

+ 2 - 1
app/Http/Controllers/API/DepartmentController.php

@@ -14,8 +14,9 @@ class DepartmentController extends Controller
 
     public function index(Request $request)
     {
+        $sort=$request->input('sort','desc');
         $pageSize=$request->get('page_size') ?? 10;
-        $department=Department::filter($request->all())->where("parent_id",0)->with(['children'])->paginate($pageSize);
+        $department=Department::filter($request->all())->where("parent_id",0) ->orderBy('created_at',$sort)->with(['children'])->paginate($pageSize);
 
         return DepartmentResource::collection($department);
     }

+ 2 - 1
app/Http/Controllers/API/PlanController.php

@@ -20,8 +20,9 @@ class PlanController extends Controller
      */
     public function index(Request $request)
     {
+        $sort=$request->input('sort','desc');
         $pageSize=$request->get('page_size') ?? 10;
-        $plans = Plan::filter($request->all())->where("parent_id", 0)->with(['children','asset'=>function($query){
+        $plans = Plan::filter($request->all())->where("parent_id", 0)->orderBy('created_at',$sort)->with(['children','asset'=>function($query){
             $query->with('parent');
         }])->paginate($pageSize);
 

+ 2 - 1
app/Http/Controllers/API/ProjectController.php

@@ -57,7 +57,8 @@ class ProjectController extends Controller
     public function index(Request $request)
     {
         $pageSize=$request->get('page_size') ?? 10;
-        $projectAsset = Project::filter($request->all())->allowed()->with('assets')->paginate($pageSize);
+        $sort=$request->input('sort','desc');
+        $projectAsset = Project::filter($request->all())->allowed()->orderBy('created_at',$sort)->with('assets')->paginate($pageSize);
 
         return ProjectResource::collection($projectAsset);
     }

+ 2 - 1
app/Http/Controllers/API/RequirementController.php

@@ -31,8 +31,9 @@ class RequirementController extends Controller
      */
     public function index(Request $request)
     {
+        $sort=$request->input('sort','desc');
         $pageSize=$request->get('page_size') ?? 10;
-        $requirements=Requirement::filter($request->all())->where('company_id',Auth::user()->company_id)->with(['createdBy', 'plan','group','asset'=>function($query){
+        $requirements=Requirement::filter($request->all())->where('company_id',Auth::user()->company_id)->orderBy('created_at',$sort)->with(['createdBy', 'plan','group','asset'=>function($query){
             $query->with('parent');
         }]) ->paginate($pageSize);
 

+ 2 - 0
app/Http/Controllers/API/TaskController.php

@@ -37,11 +37,13 @@ class TaskController extends Controller
     public function index(Request $request)
     {
         $pageSize=$request->get('page_size') ?? 10;
+        $sort=$request->input('sort','desc');
         $tasks = Task::query()
             ->where("parent_id", 0)
             ->with(['children', 'assignTo', 'createdBy'])
             ->filter($request->all())
             ->allowed()
+            ->orderBy('created_at',$sort)
             ->paginate($pageSize);
 
         return TaskResource::collection($tasks);

+ 3 - 2
app/Http/Controllers/API/UserController.php

@@ -67,15 +67,16 @@ class UserController extends Controller
     }
 
     public function index(Request $request){
+        $sort=$request->input('sort','desc');
         //超管能看到所有用户
         if(Auth::user()->super_admin){
-            $user = User::query()->filter($request->all())->paginate();
+            $user = User::query()->filter($request->all())->orderBy('created_at',$sort)->paginate();
             return UserSimpleResource::collection($user);
         }
         //普通管理员能看到自己公司的用户
         $user=User::query()
             ->where('company_id',Auth::user()->company_id)
-            ->filter($request->all()) ->paginate();
+            ->filter($request->all())->orderBy('created_at',$sort)->paginate();
         return UserInfoResource::collection($user);
     }
 

+ 1 - 0
app/Http/Resources/API/AssetRequirementResource.php

@@ -26,6 +26,7 @@ class AssetRequirementResource extends JsonResource
             'status' => $this->status,
             'asset_id' => $this->asset_id,
             'asset' => new AssetParentResource($this->asset),
+            'created_at'=>(string)$this->created_at,
         ];
     }
 }

+ 1 - 0
app/Http/Resources/API/DepartmentResource.php

@@ -25,6 +25,7 @@ class DepartmentResource extends JsonResource
                     return new DepartmentResource($child);
                 })->all();
             }),
+          'created_at' => (string)$this->created_at,
         ];
     }
 }

+ 1 - 0
app/Http/Resources/API/PlanResource.php

@@ -32,6 +32,7 @@ class PlanResource extends JsonResource
                 })->all();
             }),
             'asset' => new AssetParentResource($this->asset),
+            'created_at'=>(string)$this->created_at,
         ];
     }
 }

+ 1 - 0
app/Http/Resources/API/ProjectResource.php

@@ -30,6 +30,7 @@ class ProjectResource extends JsonResource
                     return new SimpleAssetResource($asset);
                 })->all();
             }),
+            'created_at'=>(string)$this->created_at,
             //'asset' => new AssetParentResource($this->asset),
         ];
     }

+ 1 - 0
app/Http/Resources/API/TaskResource.php

@@ -29,6 +29,7 @@ class TaskResource extends JsonResource
                     return new TaskResource($child);
                 })->all();
             }),
+            'created_at'=>(string)$this->created_at,
         ];
     }
 }