@@ -18,11 +18,12 @@ class AssetController extends Controller
*/
public function index(Request $request)
{
+ $pageSize=$request->get('page_size') ?? 10;
$assets = Asset::filter($request->all())
->where("parent_id", 0)
->where('company_id',Auth::user()->company_id)
->with(['children','children.children'])
- ->paginate();
+ ->paginate($pageSize);
return AssetResource::collection($assets);
}
@@ -16,8 +16,8 @@ class AssetGroupController extends Controller
- $name = $request->input('name');
- $groups = AssetGroup::where('name', 'like', "%{$name}%")->orderByDesc("sequence")->get();
+ $groups = AssetGroup::filter($request->all())->orderByDesc("sequence")->paginate($pageSize);
return AssetGroupResource::collection($groups);
@@ -14,7 +14,8 @@ class DepartmentController extends Controller
- $department=Department::filter($request->all())->where("parent_id",0)->with(['children'])->paginate();
+ $department=Department::filter($request->all())->where("parent_id",0)->with(['children'])->paginate($pageSize);
return DepartmentResource::collection($department);
@@ -18,9 +18,10 @@ class PlanController extends Controller
$plans = Plan::filter($request->all())->where("parent_id", 0)->with(['children','asset'=>function($query){
$query->with('parent');
- }])->simplePaginate();
+ }])->paginate($pageSize);
return PlanResource::collection($plans);
@@ -54,7 +54,8 @@ class ProjectController extends Controller
- $projectAsset = Project::filter($request->all())->allowed()->with('assets')->simplePaginate();
+ $projectAsset = Project::filter($request->all())->allowed()->with('assets')->paginate($pageSize);
return ProjectResource::collection($projectAsset);
@@ -31,9 +31,10 @@ class RequirementController extends Controller
$requirements=Requirement::filter($request->all())->where('company_id',Auth::user()->company_id)->with(['createdBy', 'plan','group','asset'=>function($query){
- }]) ->paginate(10);
+ }]) ->paginate($pageSize);
return AssetRequirementResource::collection($requirements);
@@ -17,7 +17,8 @@ class RequirementGroupController extends Controller
- $groups = RequirementGroup::filter($request->all())->where("parent_id",0)->with(['children'])->simplePaginate();
+ $groups = RequirementGroup::filter($request->all())->where("parent_id",0)->with(['children'])->paginate($pageSize);
return RequirementGroupResource::collection($groups);
@@ -31,12 +31,13 @@ class TaskController extends Controller
$tasks = Task::query()
->with(['children', 'assignTo', 'createdBy'])
->filter($request->all())
->allowed()
return TaskResource::collection($tasks);
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Created by IntelliJ IDEA.
+ * User: kelyliang
+ * Date: 2024/4/2
+ * Time: 上午 10:25
+ */
+
+namespace App\ModelFilters;
+use EloquentFilter\ModelFilter;
+class AssetGroupFilter extends ModelFilter
+{
+ public $relations = [];
+ public function name($name): ModelFilter
+ {
+ return $this->where('name', 'like', "%{$name}%");
+ }
+}
@@ -3,13 +3,14 @@
namespace App\Models;
use App\Models\Scopes\CompanyScope;
+use EloquentFilter\Filterable;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
class AssetGroup extends Model
- use HasFactory, SoftDeletes;
+ use HasFactory, SoftDeletes, Filterable;
protected $fillable = [
'company_id',