[智价云] 店铺责任人历史信息导出更新

app/Http/Controllers/Manager/Process/ViolationStore.php

@@ -187,15 +187,15 @@ class ViolationStore extends Controller
             foreach ($result['data'] as $key => $value) {
                 //查询第一责任人名称
                 $first_responsible_person = explode(',', $value['first_responsible_person']);
-                $first_responsible_person_name = $EmployeeModel->whereIn('id', $first_responsible_person)->pluck('name')->toarray();
+                $first_responsible_person_name = $ViolationStoreMemberModel->where('violation_store_logid',$value['id'])->whereIn('employee_id', $first_responsible_person)->pluck('employee_name')->toarray();
                 $result['data'][$key]['first_responsible_person_name'] = $first_responsible_person_name;
                 //查询责任人名称
                 $responsible_person = explode(',', $value['responsible_person']);
-                $responsible_person_name = $EmployeeModel->whereIn('id', $responsible_person)->pluck('name')->toarray();
+                $responsible_person_name =  $ViolationStoreMemberModel->where('violation_store_logid',$value['id'])->whereIn('employee_id', $responsible_person)->pluck('employee_name')->toarray();
                 $result['data'][$key]['responsible_person_name'] = $responsible_person_name;
                 //查询来源责任人名称
                 $source_responsible_person = explode(',', $value['source_responsible_person']);
-                $source_responsible_person_name = $EmployeeModel->whereIn('id', $source_responsible_person)->pluck('name')->toarray();
+                $source_responsible_person_name = $ViolationStoreMemberModel->where('violation_store_logid',$value['id'])->whereIn('employee_id', $source_responsible_person)->pluck('employee_name')->toarray();
                 $result['data'][$key]['source_responsible_person_name'] = $source_responsible_person_name;
             }
         }
@@ -370,49 +370,20 @@ class ViolationStore extends Controller
      */
     public function processing_responsible_person($result)
     {
-        $EmployeeModel = new EmployeeModel();
-        //获取所有员工
-        $employeee_data = $EmployeeModel->select(['id', 'name'])->get()->toarray();
-        $employeee_list = [];
-        if (!empty($employeee_data)) {
-            foreach ($employeee_data as $key => $value) {
-                $employeee_list[$value['id']] = $value['name'];
-            }
-        }
+        $ViolationStoreMemberModel = new ViolationStoreMemberModel();
         if (isset($result) && count($result) > 0) {
             foreach ($result as $key => $value) {
                 //查询第一责任人名称
-                $first_responsible_person = $value['first_responsible_person'] != '' ? explode(',', $value['first_responsible_person']) : [];
-                $first_responsible_person_name = [];
-                if (!empty($first_responsible_person)) {
-                    foreach ($first_responsible_person as $k => $v) {
-                        if (isset($employeee_list[$v])) {
-                            $first_responsible_person_name[] = $employeee_list[$v];
-                        }
-                    }
-                }
+                $first_responsible_person = explode(',', $value['first_responsible_person']);
+                $first_responsible_person_name = $ViolationStoreMemberModel->where('violation_store_logid',$value['id'])->whereIn('employee_id', $first_responsible_person)->pluck('employee_name')->toarray();
                 $result[$key]['first_responsible_person_name'] = $first_responsible_person_name;
                 //查询责任人名称
-                $responsible_person = $value['responsible_person'] != '' ? explode(',', $value['responsible_person']) : [];
-                $responsible_person_name = [];
-                if (!empty($responsible_person)) {
-                    foreach ($responsible_person as $k => $v) {
-                        if (isset($employeee_list[$v])) {
-                            $responsible_person_name[] = $employeee_list[$v];
-                        }
-                    }
-                }
+                $responsible_person = explode(',', $value['responsible_person']);
+                $responsible_person_name =  $ViolationStoreMemberModel->where('violation_store_logid',$value['id'])->whereIn('employee_id', $responsible_person)->pluck('employee_name')->toarray();
                 $result[$key]['responsible_person_name'] = $responsible_person_name;
                 //查询来源责任人名称
-                $source_responsible_person = $value['source_responsible_person'] != '' ? explode(',', $value['source_responsible_person']) : [];
-                $source_responsible_person_name = [];
-                if (!empty($source_responsible_person)) {
-                    foreach ($source_responsible_person as $k => $v) {
-                        if (isset($employeee_list[$v])) {
-                            $source_responsible_person_name[] = $employeee_list[$v];
-                        }
-                    }
-                }
+                $source_responsible_person = explode(',', $value['source_responsible_person']);
+                $source_responsible_person_name = $ViolationStoreMemberModel->where('violation_store_logid',$value['id'])->whereIn('employee_id', $source_responsible_person)->pluck('employee_name')->toarray();
                 $result[$key]['source_responsible_person_name'] = $source_responsible_person_name;
             }
         }