DemandProcess 关联关系修改

DemandController 控制器修改
DemandProcController 控制器修改

app/DemandProcess.php

@@ -2,14 +2,15 @@
 
 namespace App;
 
-use Illuminate\Database\Eloquent\Model;
-
 use App\Traits\ModelLogChanging;
+use App\Traits\ModelTimeFormat;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class DemandProcess extends Model
 {
     use ModelLogChanging;
+    use ModelTimeFormat;
 
     protected $fillable = ['demand_id', 'processor', 'explain'];
 
@@ -18,7 +19,7 @@ class DemandProcess extends Model
         return $this->belongsTo(Demand::class);
     }
 
-    public function processor(): BelongsTo
+    public function user(): BelongsTo
     {
         return $this->belongsTo(User::class, 'processor', 'id');
     }

app/Http/Controllers/DemandController.php

@@ -28,7 +28,7 @@ class DemandController extends Controller
     {
         // 查询权限
 
-        $demands = Demand::query()->with(['initiator', 'handle', 'uploadFile', 'processes'])->filter($filters)->orderByDesc('demands.id')->paginate($request['paginate'] ?? 50);
+        $demands = Demand::query()->with(['initiator', 'handle', 'uploadFile', 'processes.user'])->filter($filters)->orderByDesc('demands.id')->paginate($request['paginate'] ?? 50);
 
         return view('maintenance.demand.index', compact('demands'));
     }

app/Http/Controllers/DemandProcessController.php

@@ -20,10 +20,33 @@ class DemandProcessController extends Controller
     {
         $params = $request->all();
         $params['processor'] = Auth::user()['id'];
+
         $demandProcess = DemandProcess::query()->create($params);
 
-        $demandProcess->loadMissing('processor');
+        $demandProcess->loadMissing('user');
+
         $this->success($demandProcess);
     }
 
+    /**
+     * @param DemandProcessRequest $request
+     * @throws \Exception
+     */
+    public function destroyApi(DemandProcessRequest  $request)
+    {
+
+        $demandProcess = DemandProcess::query()->where('id',$request['id'])->first();
+
+        if($demandProcess['processor']!==Auth::user()['id'])$this->error('非当前过程创建人不可删除');
+
+        try {
+            $bool = $demandProcess->delete();
+            if($bool)$this->success();
+            $this->error('删除失败');
+        } catch (\Exception $e) {
+            $this->error('删除异常'.$e->getMessage());
+        }
+
+
+    }
 }