HDK/hyperf-admin
1
0
Fork 0
mirror of http://124.126.16.154:8888/singularity/hyperf-admin.git synced 2026-01-15 05:35:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: 脚手架增加group_by语法支持

Browse Source
This commit is contained in:
七戒
2021-06-15 15:52:14 +08:00
parent 839bd1e0b9
commit f4c429ea28
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/base-utils/src/Scaffold/Controller/AbstractController.php
View File

@@ -203,11 +203,12 @@ abstract class AbstractController extends Controller
} }
} }
$order_by = $this->options['order_by'] ?? ''; $order_by = $this->options['order_by'] ?? '';
$group_by = $this->options['group_by'] ?? '';
if ($sortColumn = $this->request->input('_sort_column') && $sortType = $this->request->input('_sort_type')) { if ($sortColumn = $this->request->input('_sort_column') && $sortType = $this->request->input('_sort_type')) {
$order_by = $sortColumn . ' ' . $sortType; $order_by = $sortColumn . ' ' . $sortType;
} }
if (empty($conditions) && !($this->options['defaultList'] ?? true)) { if (empty($conditions) && !($this->options['defaultList'] ?? true)) {
return compact('page', 'size', 'conditions', 'order_by', 'columns', 'table_options'); return compact('page', 'size', 'conditions', 'order_by', 'columns', 'table_options','group_by');
} }
if (method_exists($this, 'beforeListQuery')) { if (method_exists($this, 'beforeListQuery')) {
$hook_params = get_class_method_params_name($this, 'beforeListQuery'); $hook_params = get_class_method_params_name($this, 'beforeListQuery');
@@ -215,9 +216,11 @@ abstract class AbstractController extends Controller
$this->beforeListQuery($conditions, $order_by); $this->beforeListQuery($conditions, $order_by);
} elseif (count($hook_params) === 1) { } elseif (count($hook_params) === 1) {
$this->beforeListQuery($conditions); $this->beforeListQuery($conditions);
} elseif (count($hook_params) === 4) {
$this->beforeListQuery($conditions, $order_by, $group_by, $columns);
} }
} }
return compact('page', 'size', 'conditions', 'order_by', 'columns', 'table_options'); return compact('page', 'size', 'conditions', 'order_by', 'columns', 'table_options','group_by');
} }
/** /**
@@ -232,13 +235,26 @@ abstract class AbstractController extends Controller
$order_by, $order_by,
$columns, $columns,
$tableOptions, $tableOptions,
$group_by
] = array_values($this->makeWhere()); ] = array_values($this->makeWhere());
$entity = $this->getEntity(); $entity = $this->getEntity();
$count = $entity->count($conditions); // $count = $entity->count($conditions);
if ($group_by) {
$entity->getModel()->groupBy($group_by);
$count_query = clone $entity;
$count = $count_query->getModel()->select(
gettype($group_by) == 'array' ? $group_by[0] : $group_by,
DB::raw('count(*) as total')
)->get()->count();
} else {
$count = $entity->count($conditions);
}
$list = []; $list = [];
if ($count) { if ($count) {
$attr['select'] = $columns; $attr['select'] = $columns;
$order_by && $attr['order_by'] = $order_by; $order_by && $attr['order_by'] = $order_by;
$group_by && $attr['group_by'] = $group_by;
$list = $entity->list($conditions, $attr, $page, $size); $list = $entity->list($conditions, $attr, $page, $size);
} }
$list = $this->listFilter($list, $tableOptions); $list = $this->listFilter($list, $tableOptions);