hant/allocatr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
todaywindy 2025-08-15 15:02:24 +08:00
commit 029d515617
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
application/admin/controller/statistics/Item.php
View File

@ -96,7 +96,7 @@ class Item extends Backend
if (!empty($filter)){ if (!empty($filter)){
$arr = explode(' - ', $filter); $arr = explode(' - ', $filter);
if (trim($arr[0])) { if (trim($arr[0])) {
$start = trim($arr[0]); $start = trim($arr[0]). ' 00:00:00';
} }
if (trim($arr[1])) { if (trim($arr[1])) {
$end_at = trim($arr[1]) . ' 23:29:59'; $end_at = trim($arr[1]) . ' 23:29:59';
@ -113,10 +113,6 @@ class Item extends Backend
if(!empty(request()->get('source',null))){ if(!empty(request()->get('source',null))){
$build->where('source',request()->get('source')); $build->where('source',request()->get('source'));
} }
//城市
/* if(!empty(request()->post('area_id',null))){
$build->where('area_id','LIKE',request()->post('source').'%');
}*/
if(!empty(request()->get('item_id',null))){ if(!empty(request()->get('item_id',null))){
$item_id =request()->get('item_id'); $item_id =request()->get('item_id');
@ -125,7 +121,7 @@ class Item extends Backend
$build->whereIn('item_id', $item_ids); $build->whereIn('item_id', $item_ids);
} }
$build->whereBetween('create_time', [$start, $end_at]) $build->whereBetween('audit_time', [$start, $end_at])
->field([ ->field([
'item_title name', // 类型 'item_title name', // 类型
'sum(total) total', // 营业额 'sum(total) total', // 营业额
@ -141,6 +137,7 @@ class Item extends Backend
])->group('item_title') ])->group('item_title')
->order('count_num', 'desc'); ->order('count_num', 'desc');
// dd($total); // dd($total);
$res = $build->paginate($limit); $res = $build->paginate($limit);
$total = $res->total(); $total = $res->total();
$ress = $res->items(); $ress = $res->items();