[智价云] 违规处理历史人员信息展示更新

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

@@ -15,7 +15,6 @@ use App\Models\Manager\Process\LowPriceGoodsMember as LowPriceGoodsMemberModel;
 use App\Models\manager\Process\LowPriceGoodsRecord as LowPriceGoodsRecordModel;
 use Illuminate\Support\Facades\DB;
 use App\Models\Manager\Citys as CitysModel;
-use App\Servers\Aliyun\Oss;
 use App\Jobs\Manager\Other\ExportLowPriceGoodsJobs;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Carbon;
@@ -226,15 +225,15 @@ class LowPriceGoods 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 = $LowPriceGoodsMemberModel->where('lowprice_product_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 = $LowPriceGoodsMemberModel->where('lowprice_product_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 = $LowPriceGoodsMemberModel->where('lowprice_product_logid',$value['id'])->whereIn('employee_id', $source_responsible_person)->pluck('employee_name')->toarray();
                 $result['data'][$key]['source_responsible_person_name'] = $source_responsible_person_name;
             }
         }

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

@@ -14,9 +14,7 @@ use PhpOffice\PhpSpreadsheet\IOFactory;
 use App\Models\Manager\Process\ViolationProductMember as ViolationProductMemberModel;
 use App\Models\Manager\Citys as CitysModel;
 use Illuminate\Support\Facades\DB;
-use App\Servers\Aliyun\Oss;
 use App\Jobs\Manager\Other\ExportViolationProductJobs;
-use App\Models\Manager\Other\DownloadTask as DownloadTaskModel;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Carbon;
 use App\Jobs\Manager\Process\ScrapeDataProductJobs;
@@ -222,15 +220,15 @@ class ViolationProduct 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 = $ViolationProductMemberModel->where('violation_product_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 = $ViolationProductMemberModel->where('violation_product_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 = $ViolationProductMemberModel->where('violation_product_logid',$value['id'])->whereIn('employee_id', $source_responsible_person)->pluck('employee_name')->toarray();
                 $result['data'][$key]['source_responsible_person_name'] = $source_responsible_person_name;
             }
         }

app/Jobs/Manager/Other/ExportLowPriceGoodsJobs.php

@@ -285,49 +285,20 @@ class ExportLowPriceGoodsJobs implements ShouldQueue
      */
     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'];
-            }
-        }
+        $LowPriceGoodsMemberModel = new LowPriceGoodsMemberModel();
         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 = $LowPriceGoodsMemberModel->where('lowprice_product_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 = $LowPriceGoodsMemberModel->where('lowprice_product_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 = $LowPriceGoodsMemberModel->where('lowprice_product_logid', $value['id'])->whereIn('employee_id', $source_responsible_person)->pluck('employee_name')->toarray();
                 $result[$key]['source_responsible_person_name'] = $source_responsible_person_name;
             }
         }

app/Jobs/Manager/Other/ExportViolationProductJobs.php

@@ -16,6 +16,7 @@ use App\Servers\Aliyun\Oss;
 use App\Facades\Servers\Logs\Log;
 use App\Models\Manager\Other\DownloadTask as DownloadTaskModel;
 use Illuminate\Support\Facades\Cache;
+use App\Models\Manager\Process\ViolationProductMember as ViolationProductMemberModel;
 
 
 /**
@@ -80,6 +81,7 @@ class ExportViolationProductJobs implements ShouldQueue
     public function export_excel($message_data)
     {
         $ViolationProductModel = new ViolationProductModel();
+        $ViolationProductMemberModel = new ViolationProductMemberModel();
         $EmployeeModel         = new EmployeeModel();
         $admin_company_id = $message_data['admin_company_id'];
         $company_id = $message_data['company_id'];
@@ -175,7 +177,7 @@ class ExportViolationProductJobs implements ShouldQueue
         //多选第一责任人
         if ($first_responsible_person && is_string($first_responsible_person)) {
             $first_responsible_person = explode(',', $first_responsible_person);
-            $subQuery = $ViolationProductModel->whereIn('employee_id', $first_responsible_person)->where('duty_type',1)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
+            $subQuery = $ViolationProductMemberModel->whereIn('employee_id', $first_responsible_person)->where('duty_type',1)->distinct('violation_product_logid')->select('violation_product_logid');
             $ViolationProductModel = $ViolationProductModel->whereIn('id', function ($query1) use ($subQuery) {
                 $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
             });
@@ -183,7 +185,7 @@ class ExportViolationProductJobs implements ShouldQueue
         //多选责任人
         if ($responsible_person && is_string($responsible_person)) {
             $responsible_person = explode(',', $responsible_person);
-            $subQuery = $ViolationProductModel->whereIn('employee_id', $responsible_person)->where('duty_type',2)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
+            $subQuery = $ViolationProductMemberModel->whereIn('employee_id', $responsible_person)->where('duty_type',2)->distinct('violation_product_logid')->select('violation_product_logid');
             $ViolationProductModel = $ViolationProductModel->whereIn('id', function ($query1) use ($subQuery) {
                 $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
             });
@@ -191,7 +193,7 @@ class ExportViolationProductJobs implements ShouldQueue
         //多选溯源责任人
         if ($source_responsible_person && is_string($source_responsible_person)) {
             $source_responsible_person = explode(',', $source_responsible_person);
-            $subQuery = $ViolationProductModel->whereIn('employee_id', $source_responsible_person)->where('duty_type',3)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
+            $subQuery = $ViolationProductMemberModel->whereIn('employee_id', $source_responsible_person)->where('duty_type',3)->distinct('violation_product_logid')->select('violation_product_logid');
             $ViolationProductModel = $ViolationProductModel->whereIn('id', function ($query1) use ($subQuery) {
                 $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
             });
@@ -275,49 +277,20 @@ class ExportViolationProductJobs implements ShouldQueue
      */
     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'];
-            }
-        }
+        $ViolationProductMemberModel = new ViolationProductMemberModel();
         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 = $ViolationProductMemberModel->where('violation_product_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 = $ViolationProductMemberModel->where('violation_product_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 = $ViolationProductMemberModel->where('violation_product_logid',$value['id'])->whereIn('employee_id', $source_responsible_person)->pluck('employee_name')->toarray();
                 $result[$key]['source_responsible_person_name'] = $source_responsible_person_name;
             }
         }