添加任务和由我审批列表的公共查询列表

app/Http/Controllers/API/ApprovalController.php

@@ -45,6 +45,12 @@ class ApprovalController extends Controller
         return new ApprovalCollection($approvals);
     }
 
+    public function publicSearch(Request $request){
+        $pageSize=$request->get('page_size') ?? 10;
+        $approvals= Approval::filter($request->all())->allowed(true)->orderByDesc("created_at")->paginate($pageSize);
+        return new ApprovalCollection($approvals);
+    }
+
     /**
      * Store a newly created resource in storage.
      */

app/Http/Controllers/API/TaskController.php

@@ -43,6 +43,16 @@ class TaskController extends Controller
      */
     public function index(Request $request)
     {
+        $tasks= $this->getTasks($request);
+        return TaskResource::collection($tasks);
+    }
+
+    public function publicSearch(Request $request){
+        $tasks=$this->getTasks($request);
+        return TaskResource::collection($tasks);
+    }
+
+    protected function getTasks(Request $request){
         $pageSize=$request->get('page_size') ?? 10;
         $sort=$request->input('sort','desc');
         $tasks = Task::query()
@@ -52,8 +62,7 @@ class TaskController extends Controller
             ->allowed()
             ->orderBy('created_at',$sort)
             ->paginate($pageSize);
-
-        return TaskResource::collection($tasks);
+        return $tasks;
     }
 
     public function export(Request $request)

routes/api.php

@@ -42,6 +42,7 @@ Route::middleware(['auth:sanctum','account.limit'])->group(function () {
     Route::get("role-items",[API\RoleController::class, "publicSearch"]);
     Route::get("project-by-asset",[API\ProjectController::class, "byAsset"]);
     Route::get("project-items",[API\ProjectController::class, "publicSearch"]);
+    Route::get("task-items",[API\TaskController::class, "publicSearch"]);
     Route::get("project-tree",[API\ProjectController::class, 'tree']);
     Route::get("plan-by-assets", [API\PlanController::class, "byAssets"]);
     Route::get("notification", [API\NotificationController::class, "index"]);
@@ -68,6 +69,7 @@ Route::middleware(['auth:sanctum','account.limit'])->group(function () {
     Route::get('link-requirement-index/{plan_id}',[API\PlanController::class, "unLinkRequirement"]);
     Route::get("department-user-index",[API\DepartmentController::class,"departmentUserIndex"]);
     Route::get("all-last-dynamic",[API\ActionController::class,"lastDynamic"]);
+    Route::get("approval-items",[API\ApprovalController::class, "publicSearch"]);
 
     // Allow access only to admin role
     Route::middleware(['permission', 'role.super-admin', 'system.operation-log'])->group(function () {