[智价云] 数据清洗更新

app/Jobs/Manager/Process/LowPriceGoodsDataJobs.php

@@ -82,7 +82,7 @@ class LowPriceGoodsDataJobs implements ShouldQueue
         $specify_responsible_person = $message_data['specify_responsible_person']; //指派责任人 0=开启 1=关闭
         $limit = isset($message_data['limit']) ? $message_data['limit'] : 50;
         $page = isset($message_data['page']) ? $message_data['page'] : 1;
-        $company_id = isset($message_data['company_id']) ? $message_data['company_id'] : 0;
+        $company_id = isset($message_data['company_id']) ? $message_data['company_id'] : 0;//品牌方公司ID
 
         $where = [];
         if ($platform != '0') {
@@ -187,6 +187,7 @@ class LowPriceGoodsDataJobs implements ShouldQueue
                 //查询指定公司第一责任人
                 $EmployeeModel = $EmployeeModel->where('company_id', $company_id);
                 if (!empty($employee_id_list)) {
+                    $where_query1[] = ['company_id', '=', $company_id];
                     $where_query1[] = ['id', 'in', $employee_id_list];
                     $where_query1[] = ['status', '=', 0];
                     $where_query1[] = ['duty_type', '=', 1]; //责任类型1=第一责任人，2=责任人
@@ -194,6 +195,7 @@ class LowPriceGoodsDataJobs implements ShouldQueue
                 //查询地区配置的第一责任人
                 $employee_id_area = $EmployeeAreaModel->where('city_id', $product_data['city_id'])->pluck('employee_id')->toarray();
                 if (!empty($employee_id_area)) {
+                    $where_query2[] = ['company_id', '=', $company_id];
                     $where_query2[] = ['id', 'in', $employee_id_area];
                     $where_query2[] = ['status', '=', 0];
                     $where_query2[] = ['duty_type', '=', 1]; //责任类型1=第一责任人，2=责任人
@@ -201,7 +203,7 @@ class LowPriceGoodsDataJobs implements ShouldQueue
                 //查询平台配置的第一责任人
                 $employee_id_platform = $EmployeePlatformModel->where('platform_id', $product_data['platform_id'])->pluck('employee_id')->toarray();
                 if (!empty($employee_id_platform)) {
-                    //如果存在平台配置责任人，则查询地区相关的责任人或者平台配置的责任人
+                    $where_query3[] = ['company_id', '=', $company_id];
                     $where_query3[] = ['id', 'in', $employee_id_platform];
                     $where_query3[] = ['status', '=', 0];
                     $where_query3[] = ['duty_type', '=', 1]; //责任类型1=第一责任人，2=责任人
@@ -216,6 +218,7 @@ class LowPriceGoodsDataJobs implements ShouldQueue
                 //查询指定公司责任人
                 $EmployeeModel = $EmployeeModel->where('company_id', $company_id);
                 if (!empty($employee_id_list)) {
+                    $where_query1[] = ['company_id', '=', $company_id];
                     $where_query1[] = ['id', 'in', $employee_id_list];
                     $where_query1[] = ['status', '=', 0];
                     $where_query1[] = ['duty_type', '=', 2]; //责任类型1=第一责任人，2=责任人
@@ -223,6 +226,7 @@ class LowPriceGoodsDataJobs implements ShouldQueue
                 //查询地区配置的员工
                 $employee_id_area = $EmployeeAreaModel->where('city_id', $product_data['city_id'])->pluck('employee_id')->toarray();
                 if (!empty($employee_id_area)) {
+                    $where_query2[] = ['company_id', '=', $company_id];
                     $where_query2[] = ['id', 'in', $employee_id_area];
                     $where_query2[] = ['status', '=', 0];
                     $where_query2[] = ['duty_type', '=', 2]; //责任类型1=第一责任人，2=责任人
@@ -230,7 +234,7 @@ class LowPriceGoodsDataJobs implements ShouldQueue
                 //查询平台配置的员工
                 $employee_id_platform = $EmployeePlatformModel->where('platform_id', $product_data['platform_id'])->pluck('employee_id')->toarray();
                 if (!empty($employee_id_platform)) {
-                    //如果存在平台配置责任人，则查询地区相关的责任人或者平台配置的责任人
+                    $where_query3[] = ['company_id', '=', $company_id];
                     $where_query3[] = ['id', 'in', $employee_id_platform];
                     $where_query3[] = ['status', '=', 0];
                     $where_query3[] = ['duty_type', '=', 2]; //责任类型1=第一责任人，2=责任人

app/Jobs/Manager/Process/ViolationProductDataJobs.php

@@ -81,7 +81,7 @@ class ViolationProductDataJobs implements ShouldQueue
         $specify_responsible_person = $message_data['specify_responsible_person']; //指派责任人 0=开启 1=关闭
         $limit = isset($message_data['limit']) ? $message_data['limit'] : 50;
         $page = isset($message_data['page']) ? $message_data['page'] : 1;
-        $company_id = isset($message_data['company_id']) ? $message_data['company_id'] : 0;
+        $company_id = isset($message_data['company_id']) ? $message_data['company_id'] : 0;//品牌方公司ID
 
         $where = [];
         if ($platform != '0') {
@@ -182,6 +182,7 @@ class ViolationProductDataJobs implements ShouldQueue
                 //查询指定公司第一责任人
                 $EmployeeModel = $EmployeeModel->where('company_id', $company_id);
                 if (!empty($employee_id_list)) {
+                    $where_query1[] = ['company_id', '=', $company_id];
                     $where_query1[] = ['id', 'in', $employee_id_list];
                     $where_query1[] = ['status', '=', 0];
                     $where_query1[] = ['duty_type', '=', 1]; //责任类型1=第一责任人，2=责任人
@@ -189,6 +190,7 @@ class ViolationProductDataJobs implements ShouldQueue
                 //查询地区配置的第一责任人
                 $employee_id_area = $EmployeeAreaModel->where('city_id', $product_data['city_id'])->pluck('employee_id')->toarray();
                 if (!empty($employee_id_area)) {
+                    $where_query2[] = ['company_id', '=', $company_id];
                     $where_query2[] = ['id', 'in', $employee_id_area];
                     $where_query2[] = ['status', '=', 0];
                     $where_query2[] = ['duty_type', '=', 1]; //责任类型1=第一责任人，2=责任人
@@ -196,7 +198,7 @@ class ViolationProductDataJobs implements ShouldQueue
                 //查询平台配置的第一责任人
                 $employee_id_platform = $EmployeePlatformModel->where('platform_id', $product_data['platform_id'])->pluck('employee_id')->toarray();
                 if (!empty($employee_id_platform)) {
-                    //如果存在平台配置责任人，则查询地区相关的责任人或者平台配置的责任人
+                    $where_query3[] = ['company_id', '=', $company_id];
                     $where_query3[] = ['id', 'in', $employee_id_platform];
                     $where_query3[] = ['status', '=', 0];
                     $where_query3[] = ['duty_type', '=', 1]; //责任类型1=第一责任人，2=责任人
@@ -211,6 +213,7 @@ class ViolationProductDataJobs implements ShouldQueue
                 //查询指定公司责任人
                 $EmployeeModel = $EmployeeModel->where('company_id', $company_id);
                 if (!empty($employee_id_list)) {
+                    $where_query1[] = ['company_id', '=', $company_id];
                     $where_query1[] = ['id', 'in', $employee_id_list];
                     $where_query1[] = ['status', '=', 0];
                     $where_query1[] = ['duty_type', '=', 2]; //责任类型1=第一责任人，2=责任人
@@ -218,6 +221,7 @@ class ViolationProductDataJobs implements ShouldQueue
                 //查询地区配置的员工
                 $employee_id_area = $EmployeeAreaModel->where('city_id', $product_data['city_id'])->pluck('employee_id')->toarray();
                 if (!empty($employee_id_area)) {
+                    $where_query2[] = ['company_id', '=', $company_id];
                     $where_query2[] = ['id', 'in', $employee_id_area];
                     $where_query2[] = ['status', '=', 0];
                     $where_query2[] = ['duty_type', '=', 2]; //责任类型1=第一责任人，2=责任人
@@ -225,7 +229,7 @@ class ViolationProductDataJobs implements ShouldQueue
                 //查询平台配置的员工
                 $employee_id_platform = $EmployeePlatformModel->where('platform_id', $product_data['platform_id'])->pluck('employee_id')->toarray();
                 if (!empty($employee_id_platform)) {
-                    //如果存在平台配置责任人，则查询地区相关的责任人或者平台配置的责任人
+                    $where_query3[] = ['company_id', '=', $company_id];
                     $where_query3[] = ['id', 'in', $employee_id_platform];
                     $where_query3[] = ['status', '=', 0];
                     $where_query3[] = ['duty_type', '=', 2]; //责任类型1=第一责任人，2=责任人

app/Jobs/Manager/Process/ViolationStoreDataJobs.php

@@ -78,7 +78,7 @@ class ViolationStoreDataJobs implements ShouldQueue
         $specify_responsible_person = $message_data['specify_responsible_person']; //指派责任人 0=开启 1=关闭
         $limit = isset($message_data['limit']) ? $message_data['limit'] : 50;
         $page = isset($message_data['page']) ? $message_data['page'] : 1;
-        $company_id = isset($message_data['company_id']) ? $message_data['company_id'] : 0;
+        $company_id = isset($message_data['company_id']) ? $message_data['company_id'] : 0;//品牌方公司ID
 
         if ($platform != '0') {
             $platform = explode(',', $platform);
@@ -165,6 +165,7 @@ class ViolationStoreDataJobs implements ShouldQueue
                 //查询指定公司第一责任人
                 $EmployeeModel = $EmployeeModel->where('company_id', $company_id);
                 if (!empty($employee_id_list)) {
+                    $where_query1[] = ['company_id', '=', $company_id];
                     $where_query1[] = ['id', 'in', $employee_id_list];
                     $where_query1[] = ['status', '=', 0];
                     $where_query1[] = ['duty_type', '=', 1]; //责任类型1=第一责任人，2=责任人
@@ -172,6 +173,7 @@ class ViolationStoreDataJobs implements ShouldQueue
                 //查询地区配置的第一责任人
                 $employee_id_area = $EmployeeAreaModel->where('city_id', $product_data['city_id'])->pluck('employee_id')->toarray();
                 if (!empty($employee_id_area)) {
+                    $where_query2[] = ['company_id', '=', $company_id];
                     $where_query2[] = ['id', 'in', $employee_id_area];
                     $where_query2[] = ['status', '=', 0];
                     $where_query2[] = ['duty_type', '=', 1]; //责任类型1=第一责任人，2=责任人
@@ -179,7 +181,7 @@ class ViolationStoreDataJobs implements ShouldQueue
                 //查询平台配置的第一责任人
                 $employee_id_platform = $EmployeePlatformModel->where('platform_id', $product_data['platform_id'])->pluck('employee_id')->toarray();
                 if (!empty($employee_id_platform)) {
-                    //如果存在平台配置责任人，则查询地区相关的责任人或者平台配置的责任人
+                    $where_query3[] = ['company_id', '=', $company_id];
                     $where_query3[] = ['id', 'in', $employee_id_platform];
                     $where_query3[] = ['status', '=', 0];
                     $where_query3[] = ['duty_type', '=', 1]; //责任类型1=第一责任人，2=责任人
@@ -194,6 +196,7 @@ class ViolationStoreDataJobs implements ShouldQueue
                 //查询指定公司责任人
                 $EmployeeModel = $EmployeeModel->where('company_id', $company_id);
                 if (!empty($employee_id_list)) {
+                    $where_query1[] = ['company_id', '=', $company_id];
                     $where_query1[] = ['id', 'in', $employee_id_list];
                     $where_query1[] = ['status', '=', 0];
                     $where_query1[] = ['duty_type', '=', 2]; //责任类型1=第一责任人，2=责任人
@@ -201,6 +204,7 @@ class ViolationStoreDataJobs implements ShouldQueue
                 //查询地区配置的员工
                 $employee_id_area = $EmployeeAreaModel->where('city_id', $product_data['city_id'])->pluck('employee_id')->toarray();
                 if (!empty($employee_id_area)) {
+                    $where_query2[] = ['company_id', '=', $company_id];
                     $where_query2[] = ['id', 'in', $employee_id_area];
                     $where_query2[] = ['status', '=', 0];
                     $where_query2[] = ['duty_type', '=', 2]; //责任类型1=第一责任人，2=责任人
@@ -208,7 +212,7 @@ class ViolationStoreDataJobs implements ShouldQueue
                 //查询平台配置的员工
                 $employee_id_platform = $EmployeePlatformModel->where('platform_id', $product_data['platform_id'])->pluck('employee_id')->toarray();
                 if (!empty($employee_id_platform)) {
-                    //如果存在平台配置责任人，则查询地区相关的责任人或者平台配置的责任人
+                    $where_query3[] = ['company_id', '=', $company_id];
                     $where_query3[] = ['id', 'in', $employee_id_platform];
                     $where_query3[] = ['status', '=', 0];
                     $where_query3[] = ['duty_type', '=', 2]; //责任类型1=第一责任人，2=责任人