【智价云】 违规数据处理责任人模糊查询

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

@@ -54,7 +54,9 @@ class LowPriceGoods extends Controller
         $product_name = request('product_name', '');
         $product_names = request('product_names', '');
         $first_responsible_person = request('first_responsible_person', '');
+        $first_responsible_person_name = request('first_responsible_person_name', '');
         $responsible_person = request('responsible_person', '');
+        $responsible_person_name = request('responsible_person_name', '');
         $platform = request('platform', '');
         $company_name = request('company_name', '');
         $company_names = request('company_names', '');
@@ -62,6 +64,7 @@ class LowPriceGoods extends Controller
         $anonymous_store_name = request('anonymous_store_name', '');
         $store_names = request('store_names', '');
         $source_responsible_person = request('source_responsible_person', '');
+        $source_responsible_person_name = request('source_responsible_person_name', '');
         $processing_status = request('processing_status', '');
         $product_specs = request('product_specs', '');
         $online_posting_count = request('online_posting_count', '');
@@ -152,6 +155,13 @@ class LowPriceGoods extends Controller
                 $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
             });
         }
+        //第一责任人模糊查询
+        if ($first_responsible_person_name != '') {
+            $subQuery = $LowPriceGoodsMemberModel->where([['employee_name', 'like', "%$first_responsible_person_name%"]])->where('duty_type', 1)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
+            $LowPriceGoodsModel = $LowPriceGoodsModel->whereIn('id', function ($query1) use ($subQuery) {
+                $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
+            });
+        }
         //多选责任人
         if ($responsible_person && is_string($responsible_person)) {
             $responsible_person = explode(',', $responsible_person);
@@ -160,6 +170,13 @@ class LowPriceGoods extends Controller
                 $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
             });
         }
+        //责任人模糊查询
+        if ($responsible_person_name != '') {
+            $subQuery = $LowPriceGoodsMemberModel->where([['employee_name', 'like', "%$responsible_person_name%"]])->where('duty_type', 2)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
+            $LowPriceGoodsModel = $LowPriceGoodsModel->whereIn('id', function ($query1) use ($subQuery) {
+                $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
+            });
+        }
         //多选溯源责任人
         if ($source_responsible_person && is_string($source_responsible_person)) {
             $source_responsible_person = explode(',', $source_responsible_person);
@@ -168,6 +185,13 @@ class LowPriceGoods extends Controller
                 $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
             });
         }
+        //溯源责任人模糊查询
+        if ($source_responsible_person_name != '') {
+            $subQuery = $LowPriceGoodsMemberModel->where([['employee_name', 'like', "%$responsible_person_name%"]])->where('duty_type', 3)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
+            $LowPriceGoodsModel = $LowPriceGoodsModel->whereIn('id', function ($query1) use ($subQuery) {
+                $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
+            });
+        }
         //多选省份
         if ($province_ids && is_string($province_ids)) {
             $province_ids = explode(',', $province_ids);
@@ -228,16 +252,16 @@ class LowPriceGoods extends Controller
             foreach ($result['data'] as $key => $value) {
                 //查询第一责任人名称
                 $first_responsible_person = explode(',', $value['first_responsible_person']);
-                $first_responsible_person_name = $LowPriceGoodsMemberModel->where('lowprice_product_logid',$value['id'])->where('duty_type','1')->whereIn('employee_id', $first_responsible_person)->pluck('employee_name')->toarray();
-                $result['data'][$key]['first_responsible_person_name'] = $first_responsible_person_name;
+                $first_responsible_person_name_string = $LowPriceGoodsMemberModel->where('lowprice_product_logid', $value['id'])->where('duty_type', '1')->whereIn('employee_id', $first_responsible_person)->pluck('employee_name')->toarray();
+                $result['data'][$key]['first_responsible_person_name'] = $first_responsible_person_name_string;
                 //查询责任人名称
                 $responsible_person = explode(',', $value['responsible_person']);
-                $responsible_person_name = $LowPriceGoodsMemberModel->where('lowprice_product_logid',$value['id'])->where('duty_type','2')->whereIn('employee_id', $responsible_person)->pluck('employee_name')->toarray();
-                $result['data'][$key]['responsible_person_name'] = $responsible_person_name;
+                $responsible_person_name_string = $LowPriceGoodsMemberModel->where('lowprice_product_logid', $value['id'])->where('duty_type', '2')->whereIn('employee_id', $responsible_person)->pluck('employee_name')->toarray();
+                $result['data'][$key]['responsible_person_name'] = $responsible_person_name_string;
                 //查询来源责任人名称
                 $source_responsible_person = explode(',', $value['source_responsible_person']);
-                $source_responsible_person_name = $LowPriceGoodsMemberModel->where('lowprice_product_logid',$value['id'])->where('duty_type','3')->whereIn('employee_id', $source_responsible_person)->pluck('employee_name')->toarray();
-                $result['data'][$key]['source_responsible_person_name'] = $source_responsible_person_name;
+                $source_responsible_person_name_string = $LowPriceGoodsMemberModel->where('lowprice_product_logid', $value['id'])->where('duty_type', '3')->whereIn('employee_id', $source_responsible_person)->pluck('employee_name')->toarray();
+                $result['data'][$key]['source_responsible_person_name'] = $source_responsible_person_name_string;
                 //关闭快照不展示数据
                 if (!empty($snapshot_status) && $snapshot_status == 1) $result['data'][$key]['snapshot_url'] = '';
             }
@@ -267,7 +291,9 @@ class LowPriceGoods extends Controller
         $message_data['product_name'] = request('product_name', '');
         $message_data['product_names'] = request('product_names', '');
         $message_data['first_responsible_person'] = request('first_responsible_person', '');
+        $message_data['first_responsible_person_name'] = request('first_responsible_person_name', '');
         $message_data['responsible_person'] = request('responsible_person', '');
+        $message_data['responsible_person_name'] = request('responsible_person_name', '');
         $message_data['platform'] = request('platform', '');
         $message_data['company_name'] = request('company_name', '');
         $message_data['company_names'] = request('company_names', '');
@@ -275,6 +301,7 @@ class LowPriceGoods extends Controller
         $message_data['anonymous_store_name']  = request('anonymous_store_name', '');
         $message_data['store_names'] = request('store_names', '');
         $message_data['source_responsible_person'] = request('source_responsible_person', '');
+        $message_data['source_responsible_person_name'] = request('source_responsible_person_name', '');
         $message_data['processing_status'] = request('processing_status', '');
         $message_data['product_specs'] = request('product_specs', '');
         $message_data['online_posting_count'] = request('online_posting_count', '');
@@ -335,6 +362,9 @@ class LowPriceGoods extends Controller
         $collection_time_end_time = $message_data['collection_time_end_time'] ?? '';
         $merge_city_ids = $message_data['merge_city_ids'] ?? '';
         $merge_province_ids = $message_data['merge_province_ids'] ?? '';
+        $first_responsible_person_name = $message_data['first_responsible_person_name'] ?? '';
+        $responsible_person_name = $message_data['responsible_person_name'] ?? '';
+        $source_responsible_person_name = $message_data['source_responsible_person_name'] ?? '';
         // 时间条件
         if ($collection_time_start_time) $map[] = ['collection_time', '>=', strtotime($collection_time_start_time)];
         if ($collection_time_end_time) $map[] = ['collection_time', '<=', strtotime($collection_time_end_time)];
@@ -407,6 +437,13 @@ class LowPriceGoods extends Controller
                 $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
             });
         }
+        //第一责任人模糊查询
+        if ($first_responsible_person_name != '') {
+            $subQuery = $LowPriceGoodsMemberModel->where([['employee_name', 'like', "%$first_responsible_person_name%"]])->where('duty_type', 1)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
+            $LowPriceGoodsModel = $LowPriceGoodsModel->whereIn('id', function ($query1) use ($subQuery) {
+                $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
+            });
+        }
         //多选责任人
         if ($responsible_person && is_string($responsible_person)) {
             $responsible_person = explode(',', $responsible_person);
@@ -415,6 +452,13 @@ class LowPriceGoods extends Controller
                 $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
             });
         }
+        //责任人模糊查询
+        if ($responsible_person_name != '') {
+            $subQuery = $LowPriceGoodsMemberModel->where([['employee_name', 'like', "%$responsible_person_name%"]])->where('duty_type', 2)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
+            $LowPriceGoodsModel = $LowPriceGoodsModel->whereIn('id', function ($query1) use ($subQuery) {
+                $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
+            });
+        }
         //多选溯源责任人
         if ($source_responsible_person && is_string($source_responsible_person)) {
             $source_responsible_person = explode(',', $source_responsible_person);
@@ -423,6 +467,13 @@ class LowPriceGoods extends Controller
                 $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
             });
         }
+        //溯源责任人模糊查询
+        if ($source_responsible_person_name != '') {
+            $subQuery = $LowPriceGoodsMemberModel->where([['employee_name', 'like', "%$source_responsible_person_name%"]])->where('duty_type', 3)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
+            $LowPriceGoodsModel = $LowPriceGoodsModel->whereIn('id', function ($query1) use ($subQuery) {
+                $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
+            });
+        }
         //多选省份
         if ($province_ids && is_string($province_ids)) {
             $province_ids = explode(',', $province_ids);

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

@@ -52,7 +52,9 @@ class ViolationProduct extends Controller
         $product_name = request('product_name', '');
         $product_names = request('product_names', '');
         $first_responsible_person = request('first_responsible_person', '');
+        $first_responsible_person_name = request('first_responsible_person_name', '');
         $responsible_person = request('responsible_person', '');
+        $responsible_person_name = request('responsible_person_name', '');
         $platform = request('platform', '');
         $company_name = request('company_name', '');
         $company_names = request('company_names', '');
@@ -60,6 +62,7 @@ class ViolationProduct extends Controller
         $anonymous_store_name  = request('anonymous_store_name', '');
         $store_names = request('store_names', '');
         $source_responsible_person = request('source_responsible_person', '');
+        $source_responsible_person_name = request('source_responsible_person_name', '');
         $processing_status = request('processing_status', '');
         $product_specs = request('product_specs', '');
         $online_posting_count = request('online_posting_count', '');
@@ -145,6 +148,13 @@ class ViolationProduct extends Controller
                 $query1->select('violation_product_logid')->fromSub($subQuery, 'sub1');
             });
         }
+        //第一责任人模糊查询
+        if ($first_responsible_person_name !=''){
+            $subQuery = $ViolationProductMemberModel->where([['employee_name','like',"%$first_responsible_person_name%"]])->where('duty_type',1)->distinct('violation_product_logid')->select('violation_product_logid');
+            $ViolationProductModel = $ViolationProductModel->whereIn('id', function ($query1) use ($subQuery) {
+                $query1->select('violation_product_logid')->fromSub($subQuery, 'sub1');
+            });
+        }
         //多选责任人
         if ($responsible_person && is_string($responsible_person)) {
             $responsible_person = explode(',', $responsible_person);
@@ -153,6 +163,13 @@ class ViolationProduct extends Controller
                 $query1->select('violation_product_logid')->fromSub($subQuery, 'sub1');
             });
         }
+        //责任人模糊查询
+        if ($responsible_person_name !=''){
+            $subQuery = $ViolationProductMemberModel->where([['employee_name','like',"%$responsible_person_name%"]])->where('duty_type',2)->distinct('violation_product_logid')->select('violation_product_logid');
+            $ViolationProductModel = $ViolationProductModel->whereIn('id', function ($query1) use ($subQuery) {
+                $query1->select('violation_product_logid')->fromSub($subQuery, 'sub1');
+            });
+        }
         //多选溯源责任人
         if ($source_responsible_person && is_string($source_responsible_person)) {
             $source_responsible_person = explode(',', $source_responsible_person);
@@ -161,6 +178,13 @@ class ViolationProduct extends Controller
                 $query1->select('violation_product_logid')->fromSub($subQuery, 'sub1');
             });
         }
+        //溯源责任人模糊查询
+        if ($source_responsible_person_name !=''){
+            $subQuery = $ViolationProductMemberModel->where([['employee_name','like',"%$source_responsible_person_name%"]])->where('duty_type',3)->distinct('violation_product_logid')->select('violation_product_logid');
+            $ViolationProductModel = $ViolationProductModel->whereIn('id', function ($query1) use ($subQuery) {
+                $query1->select('violation_product_logid')->fromSub($subQuery, 'sub1');
+            });
+        }
         //多选省份
         if ($province_ids && is_string($province_ids)) {
             $province_ids = explode(',', $province_ids);
@@ -222,16 +246,16 @@ class ViolationProduct extends Controller
             foreach ($result['data'] as $key => $value) {
                 //查询第一责任人名称
                 $first_responsible_person = explode(',', $value['first_responsible_person']);
-                $first_responsible_person_name = $ViolationProductMemberModel->where('violation_product_logid',$value['id'])->where('duty_type','1')->whereIn('employee_id', $first_responsible_person)->pluck('employee_name')->toarray();
-                $result['data'][$key]['first_responsible_person_name'] = $first_responsible_person_name;
+                $first_responsible_person_name_string = $ViolationProductMemberModel->where('violation_product_logid',$value['id'])->where('duty_type','1')->whereIn('employee_id', $first_responsible_person)->pluck('employee_name')->toarray();
+                $result['data'][$key]['first_responsible_person_name'] = $first_responsible_person_name_string;
                 //查询责任人名称
                 $responsible_person = explode(',', $value['responsible_person']);
-                $responsible_person_name = $ViolationProductMemberModel->where('violation_product_logid',$value['id'])->where('duty_type','2')->whereIn('employee_id', $responsible_person)->pluck('employee_name')->toarray();
-                $result['data'][$key]['responsible_person_name'] = $responsible_person_name;
+                $responsible_person_name_string = $ViolationProductMemberModel->where('violation_product_logid',$value['id'])->where('duty_type','2')->whereIn('employee_id', $responsible_person)->pluck('employee_name')->toarray();
+                $result['data'][$key]['responsible_person_name'] = $responsible_person_name_string;
                 //查询来源责任人名称
                 $source_responsible_person = explode(',', $value['source_responsible_person']);
-                $source_responsible_person_name = $ViolationProductMemberModel->where('violation_product_logid',$value['id'])->where('duty_type','3')->whereIn('employee_id', $source_responsible_person)->pluck('employee_name')->toarray();
-                $result['data'][$key]['source_responsible_person_name'] = $source_responsible_person_name;
+                $source_responsible_person_name_string = $ViolationProductMemberModel->where('violation_product_logid',$value['id'])->where('duty_type','3')->whereIn('employee_id', $source_responsible_person)->pluck('employee_name')->toarray();
+                $result['data'][$key]['source_responsible_person_name'] = $source_responsible_person_name_string;
                 //关闭快照不展示数据
                 if(!empty($snapshot_status) && $snapshot_status == 1) $result['data'][$key]['snapshot_url'] = '';
             }
@@ -260,7 +284,9 @@ class ViolationProduct extends Controller
         $message_data['product_name'] = request('product_name', '');
         $message_data['product_names'] = request('product_names', '');
         $message_data['first_responsible_person'] = request('first_responsible_person', '');
+        $message_data['first_responsible_person_name'] = request('first_responsible_person_name', '');
         $message_data['responsible_person'] = request('responsible_person', '');
+        $message_data['responsible_person_name'] = request('responsible_person_name', '');
         $message_data['platform'] = request('platform', '');
         $message_data['company_name'] = request('company_name', '');
         $message_data['company_names'] = request('company_names', '');
@@ -268,6 +294,7 @@ class ViolationProduct extends Controller
         $message_data['anonymous_store_name'] = request('anonymous_store_name', '');
         $message_data['store_names'] = request('store_names', '');
         $message_data['source_responsible_person'] = request('source_responsible_person', '');
+        $message_data['source_responsible_person_name'] = request('source_responsible_person_name', '');
         $message_data['processing_status'] = request('processing_status', '');
         $message_data['product_specs'] = request('product_specs', '');
         $message_data['online_posting_count'] = request('online_posting_count', '');
@@ -325,6 +352,9 @@ class ViolationProduct extends Controller
         $collection_time_end_time = $message_data['collection_time_end_time'];
         $merge_province_ids = $message_data['merge_province_ids'];
         $merge_city_ids = $message_data['merge_city_ids'];
+        $first_responsible_person_name = $message_data['first_responsible_person_name'] ?? '';
+        $responsible_person_name = $message_data['responsible_person_name'] ?? '';
+        $source_responsible_person_name = $message_data['source_responsible_person_name'] ?? '';
         // 时间条件
         if ($collection_time_start_time) $map[] = ['collection_time', '>=', strtotime($collection_time_start_time)];
         if ($collection_time_end_time) $map[] = ['collection_time', '<=', strtotime($collection_time_end_time)];
@@ -389,6 +419,13 @@ class ViolationProduct extends Controller
                 $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
             });
         }
+        //第一责任人模糊查询
+        if ($first_responsible_person_name !=''){
+            $subQuery = $ViolationProductModel->where([['employee_name','like',"%$first_responsible_person_name%"]])->where('duty_type',1)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
+            $ViolationProductModel = $ViolationProductModel->whereIn('id', function ($query1) use ($subQuery) {
+                $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
+            });
+        }
         //多选责任人
         if ($responsible_person && is_string($responsible_person)) {
             $responsible_person = explode(',', $responsible_person);
@@ -397,6 +434,13 @@ class ViolationProduct extends Controller
                 $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
             });
         }
+        //责任人模糊查询
+        if ($responsible_person_name !=''){
+            $subQuery = $ViolationProductModel->where([['employee_name','like',"%$responsible_person_name%"]])->where('duty_type',2)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
+            $ViolationProductModel = $ViolationProductModel->whereIn('id', function ($query1) use ($subQuery) {
+                $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
+            });
+        }
         //多选溯源责任人
         if ($source_responsible_person && is_string($source_responsible_person)) {
             $source_responsible_person = explode(',', $source_responsible_person);
@@ -405,6 +449,13 @@ class ViolationProduct extends Controller
                 $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
             });
         }
+        //溯源责任人模糊查询
+        if ($source_responsible_person_name !=''){
+            $subQuery = $ViolationProductModel->where([['employee_name','like',"%$source_responsible_person_name%"]])->where('duty_type',3)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
+            $ViolationProductModel = $ViolationProductModel->whereIn('id', function ($query1) use ($subQuery) {
+                $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
+            });
+        }
         //多选省份
         if ($province_ids && is_string($province_ids)) {
             $province_ids = explode(',', $province_ids);

app/Jobs/Manager/Other/ExportLowPriceGoodsJobs.php

@@ -134,8 +134,12 @@ class ExportLowPriceGoodsJobs implements ShouldQueue
         $is_ultra_low_price = $message_data['is_ultra_low_price'] ?? '';
         $merge_city_ids = $message_data['merge_city_ids'] ?? '';
         $merge_province_ids = $message_data['merge_province_ids'] ?? '';
-        if ($product_specs)   $map[] = ['product_specs', 'like', "%$product_specs%"];
+        $first_responsible_person_name = $message_data['first_responsible_person_name'] ?? '';
+        $responsible_person_name = $message_data['responsible_person_name'] ?? '';
+        $source_responsible_person_name = $message_data['source_responsible_person_name'] ?? '';
+
 
+        if ($product_specs)   $map[] = ['product_specs', 'like', "%$product_specs%"];
         // 时间条件
         if ($collection_time_start_time) $map[] = ['collection_time', '>=', strtotime($collection_time_start_time)];
         if ($collection_time_end_time) $map[] = ['collection_time', '<=', strtotime($collection_time_end_time)];
@@ -202,6 +206,13 @@ class ExportLowPriceGoodsJobs implements ShouldQueue
                 $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
             });
         }
+        //第一责任人模糊查询
+        if ($first_responsible_person_name !=''){
+            $subQuery = $LowPriceGoodsMemberModel->where([['employee_name', 'like', "%$first_responsible_person_name%"]])->where('duty_type', 1)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
+            $LowPriceGoodsModel = $LowPriceGoodsModel->whereIn('id', function ($query1) use ($subQuery) {
+                $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
+            });
+        }
         //多选责任人
         if ($responsible_person && is_string($responsible_person)) {
             $responsible_person = explode(',', $responsible_person);
@@ -210,6 +221,13 @@ class ExportLowPriceGoodsJobs implements ShouldQueue
                 $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
             });
         }
+        //责任人模糊查询
+        if ($responsible_person_name != '') {
+            $subQuery = $LowPriceGoodsMemberModel->where([['employee_name', 'like', "%$responsible_person_name%"]])->where('duty_type', 2)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
+            $LowPriceGoodsModel = $LowPriceGoodsModel->whereIn('id', function ($query1) use ($subQuery) {
+                $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
+            });
+        }
         //多选溯源责任人
         if ($source_responsible_person && is_string($source_responsible_person)) {
             $source_responsible_person = explode(',', $source_responsible_person);
@@ -218,6 +236,13 @@ class ExportLowPriceGoodsJobs implements ShouldQueue
                 $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
             });
         }
+        //溯源责任人模糊查询
+        if ($source_responsible_person_name != '') {
+            $subQuery = $LowPriceGoodsMemberModel->where([['employee_name', 'like', "%$source_responsible_person_name%"]])->where('duty_type', 3)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
+            $LowPriceGoodsModel = $LowPriceGoodsModel->whereIn('id', function ($query1) use ($subQuery) {
+                $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
+            });
+        }
         //多选省份
         if ($province_ids && is_string($province_ids)) {
             $province_ids = explode(',', $province_ids);

app/Jobs/Manager/Other/ExportViolationProductJobs.php

@@ -133,6 +133,9 @@ class ExportViolationProductJobs implements ShouldQueue
         $collection_time_end_time = $message_data['collection_time_end_time'] ?? '';
         $merge_province_ids = $message_data['merge_province_ids'] ?? '';
         $merge_city_ids = $message_data['merge_city_ids'] ?? '';
+        $first_responsible_person_name = $message_data['first_responsible_person_name'] ?? '';
+        $responsible_person_name = $message_data['responsible_person_name'] ?? '';
+        $source_responsible_person_name = $message_data['source_responsible_person_name'] ?? '';
         // 时间条件
         if ($collection_time_start_time) $map[] = ['collection_time', '>=', strtotime($collection_time_start_time)];
         if ($collection_time_end_time) $map[] = ['collection_time', '<=', strtotime($collection_time_end_time)];
@@ -197,6 +200,13 @@ class ExportViolationProductJobs implements ShouldQueue
                 $query1->select('violation_product_logid')->fromSub($subQuery, 'sub1');
             });
         }
+        //第一责任人模糊查询
+        if ($first_responsible_person_name !='') {
+            $subQuery = $ViolationProductMemberModel->where([['employee_name','like',"%$first_responsible_person_name%"]])->where('duty_type', 1)->distinct('violation_product_logid')->select('violation_product_logid');
+            $ViolationProductModel = $ViolationProductModel->whereIn('id', function ($query1) use ($subQuery) {
+                $query1->select('violation_product_logid')->fromSub($subQuery, 'sub1');
+            });
+        }
         //多选责任人
         if ($responsible_person && is_string($responsible_person)) {
             $responsible_person = explode(',', $responsible_person);
@@ -205,6 +215,13 @@ class ExportViolationProductJobs implements ShouldQueue
                 $query1->select('violation_product_logid')->fromSub($subQuery, 'sub1');
             });
         }
+        //责任人模糊查询
+        if ($responsible_person_name !='') {
+            $subQuery = $ViolationProductMemberModel->where([['employee_name','like',"%$responsible_person_name%"]])->where('duty_type', 2)->distinct('violation_product_logid')->select('violation_product_logid');
+            $ViolationProductModel = $ViolationProductModel->whereIn('id', function ($query1) use ($subQuery) {
+                $query1->select('violation_product_logid')->fromSub($subQuery, 'sub1');
+           });
+        }
         //多选溯源责任人
         if ($source_responsible_person && is_string($source_responsible_person)) {
             $source_responsible_person = explode(',', $source_responsible_person);
@@ -213,6 +230,13 @@ class ExportViolationProductJobs implements ShouldQueue
                 $query1->select('violation_product_logid')->fromSub($subQuery, 'sub1');
             });
         }
+        //来源责任人模糊查询
+        if ($source_responsible_person_name !='') {
+            $subQuery = $ViolationProductMemberModel->where([['employee_name','like',"%$source_responsible_person_name%"]])->where('duty_type', 3)->distinct('violation_product_logid')->select('violation_product_logid');
+            $ViolationProductModel = $ViolationProductModel->whereIn('id', function ($query1) use ($subQuery) {
+                $query1->select('violation_product_logid')->fromSub($subQuery, 'sub1');
+            });
+        }
         //多选省份
         if ($province_ids && is_string($province_ids)) {
             $province_ids = explode(',', $province_ids);