From fda36cf5a48aa06f44bffd6a8e45a6ba73534b87 Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Wed, 20 Aug 2025 17:56:17 +0800 Subject: [PATCH] update --- app/Http/Controllers/Admin/OrdersController.php | 4 ++-- app/Models/Orders.php | 5 +++++ resources/views/admin/orders/index.blade.php | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Admin/OrdersController.php b/app/Http/Controllers/Admin/OrdersController.php index 8a27e6a..3db40b1 100755 --- a/app/Http/Controllers/Admin/OrdersController.php +++ b/app/Http/Controllers/Admin/OrdersController.php @@ -99,8 +99,8 @@ class OrdersController extends CommonController "bed" => function ($query) { $query->with(["room", "building", "area"]); }, - "orderAgreements" => function ($query) { - $query->with('file')->orderBy("id", "desc"); + "orderAgreementByLast" => function ($query) { + $query->with('file'); } ])->where('status', $status) ->where(function ($query) use ($building_id, $area_id) { diff --git a/app/Models/Orders.php b/app/Models/Orders.php index 4df5eda..5559cc6 100755 --- a/app/Models/Orders.php +++ b/app/Models/Orders.php @@ -57,6 +57,11 @@ class Orders extends SoftDeletesModel return $this->hasMany(OrderAgreement::class, "order_id","id"); } + public function orderAgreementByLast() + { + return $this->hasOne(OrderAgreement::class, "order_id","id")->orderBy("id", "desc"); + } + public function isOngoing() { return $this->status == self::STATUS_ONGOING; diff --git a/resources/views/admin/orders/index.blade.php b/resources/views/admin/orders/index.blade.php index 9de2780..48e5bd6 100755 --- a/resources/views/admin/orders/index.blade.php +++ b/resources/views/admin/orders/index.blade.php @@ -88,7 +88,7 @@