diff --git a/app/Http/Controllers/Admin/VisitAuditController.php b/app/Http/Controllers/Admin/VisitAuditController.php index 82d5b25..6a4ded0 100644 --- a/app/Http/Controllers/Admin/VisitAuditController.php +++ b/app/Http/Controllers/Admin/VisitAuditController.php @@ -113,10 +113,10 @@ class VisitAuditController extends CommonController { $all = \request()->all(); $messages = [ - 'name.required' => '名称必填' + 'visit_id.required' => '参观id必填' ]; $validator = Validator::make($all, [ - 'name' => 'required' + 'visit_id' => 'required' ], $messages); if ($validator->fails()) { return $this->fail([ResponseCode::ERROR_PARAMETER, implode(',', $validator->errors()->all())]); diff --git a/app/Http/Controllers/Admin/VisitController.php b/app/Http/Controllers/Admin/VisitController.php index 3e05e93..478a579 100644 --- a/app/Http/Controllers/Admin/VisitController.php +++ b/app/Http/Controllers/Admin/VisitController.php @@ -100,7 +100,7 @@ class VisitController extends CommonController if ($validator->fails()) { return $this->fail([ResponseCode::ERROR_PARAMETER, implode(',', $validator->errors()->all())]); } - $detail = Visit::with('visitTime','acceptAdmin.department','acceptAdminSignFile','acceptGoodsAdmin.department','visitArea')->find($all['id']); + $detail = Visit::with('audit.auditAdmin','visitTime','acceptAdmin.department','acceptAdminSignFile','acceptGoodsAdmin.department','visitArea')->find($all['id']); return $this->success($detail); } diff --git a/app/Models/Visit.php b/app/Models/Visit.php index 1731770..87ec90b 100644 --- a/app/Models/Visit.php +++ b/app/Models/Visit.php @@ -63,4 +63,8 @@ class Visit extends SoftDeletesModel return $this->hasOne(VisitArea::class,'id','visit_area_id'); } + public function audit(){ + return $this->hasMany(VisitAudit::class,'visit_id','id'); + } + } diff --git a/app/Models/VisitAudit.php b/app/Models/VisitAudit.php index 725698f..bd4890d 100644 --- a/app/Models/VisitAudit.php +++ b/app/Models/VisitAudit.php @@ -9,4 +9,9 @@ class VisitAudit extends SoftDeletesModel return $this->hasOne(Visit::class,'id','visit_id'); } + public function auditAdmin() + { + return $this->hasOne(Admin::class, 'id', 'audit_admin_id'); + } + }