|
|
@@ -1002,7 +1002,11 @@ class ItemService extends Service
|
|
|
$customer['crt_time'] = $customer['crt_time'] ? date("Y-m-d H:i:s",$customer['crt_time']): '';
|
|
|
$customer['state_title'] = Item::State_Type[$customer['state']] ?? '';
|
|
|
$customer['approval_state_title'] = Item::State_Type[$customer['approval_state']] ?? '';
|
|
|
- $customer['priority_title'] = Tag::where('id', $customer['priority_id'])->value('title') ?? "";
|
|
|
+ $tag = (new TagService())->getTagMap(array_unique([$customer['priority_id']]));
|
|
|
+ $priority_tmp = $tag[$customer['priority_id']] ?? [];
|
|
|
+ $customer['priority_title'] = $priority_tmp['title'] ?? '';
|
|
|
+ $customer['priority_code'] = $priority_tmp['code'] ?? '';
|
|
|
+ $customer['priority_color'] = $priority_tmp['color'] ?? '';
|
|
|
$customer['review_title'] = WorkFlowTemplates::where('id', $customer['review_id'])->value('title') ?? "";
|
|
|
|
|
|
$details = $this->getDetail($data['id']);
|
|
|
@@ -1389,7 +1393,7 @@ class ItemService extends Service
|
|
|
if(empty($data['data'])) return $data;
|
|
|
|
|
|
$emp = (new EmployeeService())->getEmployeeMap(array_unique(array_merge_recursive(array_column($data['data'],'charge_id'), array_column($data['data'],'crt_id'))));
|
|
|
- $priority_title = Tag::whereIn('id', array_unique(array_column($data['data'],'priority_id')))->pluck('title', 'id')->toArray();
|
|
|
+ $tag = (new TagService())->getTagMap(array_unique(array_column($data,'priority_id')));
|
|
|
|
|
|
foreach ($data['data'] as $key => $value){
|
|
|
$data['data'][$key]['crt_time'] = $value['crt_time'] ? date('Y-m-d H:i:s',$value['crt_time']) : '';
|
|
|
@@ -1399,7 +1403,9 @@ class ItemService extends Service
|
|
|
$data['data'][$key]['charge_name'] = $emp[$value['charge_id']] ?? '';
|
|
|
$data['data'][$key]['state_title'] = Item::State_Type[$value['state']] ?? "";
|
|
|
$data['data'][$key]['approval_state_title'] = Item::State_Type[$value['approval_state']] ?? "";
|
|
|
- $data['data'][$key]['priority_title'] = $priority_title[$value['priority_id']] ?? "";
|
|
|
+ $priority_tmp = $tag[$value['priority_id']] ?? [];
|
|
|
+ $data[$key]['priority_title'] = $priority_tmp['title'] ?? '';
|
|
|
+ $data[$key]['priority_color'] = $priority_tmp['color'] ?? '';
|
|
|
}
|
|
|
|
|
|
return $data;
|
