Bladeren bron

修改关联的资产获取需求分组

kely 1 jaar geleden
bovenliggende
commit
27e699170c

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

@@ -8,6 +8,7 @@ use App\Http\Requests\API\Project\LinkRequirementByPlanRequest;
 use App\Http\Requests\API\Project\LinkRequirementRequest;
 use App\Http\Requests\API\Project\PostponeRequest;
 use App\Http\Requests\API\Project\UnlinkRequirementRequest;
+use App\Http\Resources\API\AssetRequirementResource;
 use App\Http\Resources\API\ProjectAssetResource;
 use App\Http\Resources\API\ProjectDetailResource;
 use App\Http\Resources\API\SimplePlanResource;
@@ -286,6 +287,6 @@ class ProjectController extends Controller
             ? Requirement::query()->whereIn('asset_id', $project->assets?->pluck('id')->toArray())->simplePaginate()
             : [];
 
-        return RequirementResource::collection($requirements);
+        return AssetRequirementResource::collection($requirements);
     }
 }

+ 0 - 21
app/Http/Controllers/API/RequirementController.php

@@ -32,27 +32,6 @@ class RequirementController extends Controller
         return AssetRequirementResource::collection($requirements);
     }
 
-    public function byAssets(Request $request){
-        $assetIds = $request->get("assets", []);
-        $emptyResponse = $this->success(['data' => []]);
-        if (! $assetIds) {
-            return $emptyResponse;
-        }
-
-        $assets = Asset::query()->where(function ($query) use ($assetIds) {
-            foreach ($assetIds as $index => $assetId) {
-                $where = $index == 0 ? "where" : "orWhere";
-                $query->$where("path", "like", "%,". $assetId . ",%");
-            }
-        })->pluck("id");
-        if ($assets->isEmpty()) {
-            return $emptyResponse;
-        }
-
-        $requirement=Requirement::query()->with('asset')->whereIn('asset_id',$assets->toArray())->get();
-        return AssetRequirementResource::collection($requirement);
-    }
-
 //    public function byAsset(Request $request,string $assetId)
 //    {
 //        $requirements=Requirement::filter($request->all())->with(['createdBy', 'plan','group']) ->where('asset_id', $assetId)->simplePaginate();