|
@@ -46,7 +46,7 @@ class StatisticService extends Service
|
|
|
->groupBy(DB::raw("FROM_UNIXTIME(order_time, '%Y-%m-%d')"), "item_id", "employee_id")
|
|
->groupBy(DB::raw("FROM_UNIXTIME(order_time, '%Y-%m-%d')"), "item_id", "employee_id")
|
|
|
->orderby("order_date", "asc")->get()->toArray();
|
|
->orderby("order_date", "asc")->get()->toArray();
|
|
|
// $month_employee_list = $this->limit($month_employee_list, ['*'], $data);
|
|
// $month_employee_list = $this->limit($month_employee_list, ['*'], $data);
|
|
|
- $dataCollection = collect($month_employee_list['data']);
|
|
|
|
|
|
|
+ $dataCollection = collect($month_employee_list);
|
|
|
$item_ids = $dataCollection->pluck('item_id')->unique()->values()->all();
|
|
$item_ids = $dataCollection->pluck('item_id')->unique()->values()->all();
|
|
|
$employee_ids = $dataCollection->pluck('employee_id')->unique()->values()->all();
|
|
$employee_ids = $dataCollection->pluck('employee_id')->unique()->values()->all();
|
|
|
|
|
|
|
@@ -56,7 +56,7 @@ class StatisticService extends Service
|
|
|
$item = Item::Clear($user, $data);
|
|
$item = Item::Clear($user, $data);
|
|
|
$item_title_key_list = $item->wherein('id', $item_ids)->pluck("title", "id")->toArray();
|
|
$item_title_key_list = $item->wherein('id', $item_ids)->pluck("title", "id")->toArray();
|
|
|
$item_code_key_list = $item->wherein('id', $item_ids)->pluck("code", "id")->toArray();
|
|
$item_code_key_list = $item->wherein('id', $item_ids)->pluck("code", "id")->toArray();
|
|
|
- $month_employee_list['data'] = collect($month_employee_list['data'])->transform(function ($item) use ($employee_key_list, $item_title_key_list, $item_code_key_list) {
|
|
|
|
|
|
|
+ $month_employee_list = collect($month_employee_list)->transform(function ($item) use ($employee_key_list, $item_title_key_list, $item_code_key_list) {
|
|
|
$item['employee_name'] = $employee_key_list[$item['employee_id']] ?? "未知员工({$item['employee_id']})";
|
|
$item['employee_name'] = $employee_key_list[$item['employee_id']] ?? "未知员工({$item['employee_id']})";
|
|
|
$item['item_title'] = $item_title_key_list[$item['item_id']] ?? "未知项目({$item['item_id']})";
|
|
$item['item_title'] = $item_title_key_list[$item['item_id']] ?? "未知项目({$item['item_id']})";
|
|
|
$item['item_code'] = $item_code_key_list[$item['item_id']] ?? "未知项目({$item['item_id']})";
|
|
$item['item_code'] = $item_code_key_list[$item['item_id']] ?? "未知项目({$item['item_id']})";
|