diff --git a/app/Admin/Controllers/CateRankController.php b/app/Admin/Controllers/CateRankController.php index bdc733a..c24e6cf 100644 --- a/app/Admin/Controllers/CateRankController.php +++ b/app/Admin/Controllers/CateRankController.php @@ -48,7 +48,7 @@ class CateRankController extends AdminController ->columns([ amisMake()->TableColumn()->name('cate.name')->label(__('user_rank.cate_id')), amisMake()->TableColumn()->name('sort')->label(__('user_rank.sort'))->set('type', 'tpl')->tpl('${(start - 1) * size + index + 1}'), - amisMake()->TableColumn()->name('score')->label(__('user_rank.score')), + amisMake()->TableColumn()->name('avg_score')->label(__('user_rank.avg_score')), ]); return $this->baseList($crud); diff --git a/app/Exports/CateRank.php b/app/Exports/CateRank.php index 4858b4a..95bf7f2 100644 --- a/app/Exports/CateRank.php +++ b/app/Exports/CateRank.php @@ -24,7 +24,7 @@ class CateRank implements FromQuery, WithHeadings, WithMapping return [ __('user_rank.cate_id'), __('user_rank.sort'), - __('user_rank.score'), + __('user_rank.avg_score'), ]; } @@ -33,7 +33,7 @@ class CateRank implements FromQuery, WithHeadings, WithMapping return [ $item->cate?->name, ++$this->index, - $item->score, + $item->avg_score, ]; } } diff --git a/app/Models/CateRank.php b/app/Models/CateRank.php index a59e81a..41d803c 100644 --- a/app/Models/CateRank.php +++ b/app/Models/CateRank.php @@ -14,7 +14,7 @@ class CateRank extends Model use HasDateTimeFormatter, Filterable; protected $table = 'cate_rank'; - protected $fillable = ['sn', 'cate_id', 'score', 'count']; + protected $fillable = ['sn', 'cate_id', 'score', 'count', 'avg_score']; public function cate() { @@ -23,6 +23,6 @@ class CateRank extends Model public function scopeSort($q) { - $q->orderBy('sn')->orderBy('score', 'desc'); + $q->orderBy('sn')->orderBy('avg_score', 'desc'); } }