Browse Source

完善资产详情,需求数量

kely 1 year ago
parent
commit
a92a52409f

+ 5 - 1
app/Http/Controllers/API/AssetController.php

@@ -114,7 +114,11 @@ class AssetController extends Controller
     }
 
     public function report(string $id){
-        $asset = Asset::allowed()->with(['requirements','plans','projects'])->findOrFail($id);
+        $asset = Asset::allowed()->with(['requirements','plans','projects','children'])->findOrFail($id);
+        //$asset = Asset::find($id);
+        $assets=Asset::query()->where("path","like","%,".$id.",%")->pluck("id");
+        $asset->setAttribute('child_id',$assets);
+
 
         return new AssetReportResource($asset);
     }

+ 2 - 1
app/Http/Resources/API/AssetReportResource.php

@@ -10,6 +10,7 @@ namespace App\Http\Resources\API;
 
 use App\Models\Asset;
 use App\Models\AssetGroup;
+use App\Models\Requirement;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
@@ -21,7 +22,7 @@ class AssetReportResource  extends JsonResource
     {
         $now = Carbon::now();
         return[
-            'requirement_total' => $this->requirements()->count(),
+            'requirement_total' => Requirement::query()->whereIn('asset_id',$this->child_id)->count(),
             'plan_total' => $this->plans()->count(),
             'prject_total' => $this->projects()->count(),
             'plan_unexpired_total' => $planTotalCount = $this->plans()->where('begin', '<=', $now)