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

sth

Browse Source
This commit is contained in:
xman 2025-05-18 18:10:35 +08:00
parent ae305ad1b5
commit b52041680d
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
application/admin/controller/statistics/Dispatcher.php
View File

@ -77,6 +77,11 @@ class Dispatcher extends Backend
} }
} }
if(!empty($filter['admin_user'])){
$adminIds = Admin::where('username','like','%'.$filter['admin_user'].'%')->column('id');
$filter['admin_user_ids'] = $adminIds;
}
$list = $this->chart($filter,false); $list = $this->chart($filter,false);
$result = array("total" => $list->total(), "rows" => $list->items()); $result = array("total" => $list->total(), "rows" => $list->items());
@ -142,8 +147,8 @@ class Dispatcher extends Backend
->field($fields); ->field($fields);
//->where('dispatch_admin_id','>',0); //->where('dispatch_admin_id','>',0);
if(!empty($filter['admin_id'])){ if(isset($filter['admin_user_ids'])){
$builder->where('dispatch_admin_id',$filter['admin_id']); $builder->whereIn('dispatch_admin_id',$filter['admin_user_ids']);
} }
if(!empty($filter['start_time']) && !empty($filter['end_time'])){ if(!empty($filter['start_time']) && !empty($filter['end_time'])){
@ -186,7 +191,7 @@ class Dispatcher extends Backend
$datum->total_avg = $this->_calc($datum->total,$datum->finish_num,2); $datum->total_avg = $this->_calc($datum->total,$datum->finish_num,2);
if(!empty($datum->dispatch_admin_id)){ if(!empty($datum->dispatch_admin_id)){
$datum->admin_user = Admin::where($datum->dispatch_admin_id)->value('nickname')??'系统'; $datum->admin_user = Admin::where('id',$datum->dispatch_admin_id)->value('nickname')??'系统';
}else{ }else{
$datum->admin_user = '系统'; $datum->admin_user = '系统';
} }