From 894bcaa5347dbee23b00de6cb2c2096ac9e8494c Mon Sep 17 00:00:00 2001
From: liutk <961510893@qq.com>
Date: Sat, 18 May 2024 14:10:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0withcount?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/ActivityController.php | 2 +-
 app/Services/Admin/ActivityService.php       | 2 ++
 app/Services/Admin/BaseService.php           | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/Admin/Controllers/ActivityController.php b/app/Admin/Controllers/ActivityController.php
index f4cc0a9..4253328 100644
--- a/app/Admin/Controllers/ActivityController.php
+++ b/app/Admin/Controllers/ActivityController.php
@@ -46,7 +46,7 @@ class ActivityController extends AdminController
                     "2"=>"<span class='label label-success'>已结束</span>",
                     "*"=> '其他：${gender}'
                 ]),
-                amis()->TableColumn('user_count', __('admin.activities.user_count')),
+                amis()->TableColumn('logs_count', __('admin.activities.user_count')),
                 amis()->TableColumn('start_at', __('admin.activities.start_at')),
                 amis()->TableColumn('end_at', __('admin.activities.end_at')),
 
diff --git a/app/Services/Admin/ActivityService.php b/app/Services/Admin/ActivityService.php
index c16f457..13955bc 100644
--- a/app/Services/Admin/ActivityService.php
+++ b/app/Services/Admin/ActivityService.php
@@ -21,6 +21,8 @@ class ActivityService extends BaseService
 
     protected bool $modelSortAble = true;
 
+    protected array $withRelationshipsCount = ['logs'];
+
     public function store($data): bool
     {
         $columns = $this->getTableColumns();
diff --git a/app/Services/Admin/BaseService.php b/app/Services/Admin/BaseService.php
index 4fa0ecd..633aad0 100644
--- a/app/Services/Admin/BaseService.php
+++ b/app/Services/Admin/BaseService.php
@@ -10,6 +10,8 @@ use Slowlyo\OwlAdmin\Services\AdminService;
  */
 class BaseService extends AdminService
 {
+    protected array $withRelationshipsCount = [];
+
     protected array $withRelationships = [];
 
     protected string $modelFilterName = '';
@@ -38,6 +40,10 @@ class BaseService extends AdminService
             $query->with($this->withRelationships);
         }
 
+        if($this->withRelationshipsCount){
+            $query->withCount($this->withRelationshipsCount);
+        }
+
         if ($filter) {
             $query->filter(request()->input(), $filter);
         }