Merge branch 'feature/kpi' into develop
This commit is contained in:
@@ -87,9 +87,11 @@ class StatisticsController extends BaseController
|
||||
for($i = 1; $i <= 12; $i++){
|
||||
$result[$key]['month'][$i] = $result[$key]['month'][$i]??0;
|
||||
}
|
||||
$result[$key]['month'] = array_values($result[$key]['month']);
|
||||
$result[$key]['corp_name'] = Corp::where(['id' => $value['corp_id']])->value('name');
|
||||
$result[$key]['user_name'] = User::where(['id' => $value['user_id']])->value('name');
|
||||
}
|
||||
$result = array_values($result);
|
||||
return $this->success($result);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user