[智价云] 违规处理省份城市筛选

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

@@ -60,8 +60,10 @@ class LowPriceGoods extends Controller
         $online_posting_count = request('online_posting_count', '');
         $category_name = request('category_name', '');
         $id    = request('id', '');
-        $online_posting_cunt = request('online_posting_cunt','');
+        $online_posting_cunt = request('online_posting_cunt', '');
         $continuous_listing_count = request('continuous_listing_count', '');
+        $province_ids = request('province_ids', '');
+        $city_ids = request('city_ids', '');
         // 时间条件
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
@@ -146,6 +148,16 @@ class LowPriceGoods extends Controller
                 $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
             });
         }
+        //多选省份
+        if ($province_ids && is_string($province_ids)) {
+            $province_ids = explode(',', $province_ids);
+            $LowPriceGoodsModel = $LowPriceGoodsModel->whereIn('province_id', $province_ids);
+        }
+        //多选城市
+        if ($city_ids && is_string($city_ids)) {
+            $city_ids = explode(',', $city_ids);
+            $LowPriceGoodsModel = $LowPriceGoodsModel->whereIn('city_id', $city_ids);
+        }
 
         if ($is_admin != 1 && $company_id != 0) {
             $result = $LowPriceGoodsModel->where(function ($q) use ($user_id) {
@@ -216,6 +228,8 @@ class LowPriceGoods extends Controller
         $product_specs = request('product_specs', '');
         $online_posting_count = request('online_posting_count', '');
         $category_name = request('category_name', '');
+        $province_ids = request('province_ids', '');
+        $city_ids = request('city_ids', '');
         // 时间条件
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
@@ -296,6 +310,16 @@ class LowPriceGoods extends Controller
                 $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
             });
         }
+        //多选省份
+        if ($province_ids && is_string($province_ids)) {
+            $province_ids = explode(',', $province_ids);
+            $LowPriceGoodsModel = $LowPriceGoodsModel->whereIn('province_id', $province_ids);
+        }
+        //多选城市
+        if ($city_ids && is_string($city_ids)) {
+            $city_ids = explode(',', $city_ids);
+            $LowPriceGoodsModel = $LowPriceGoodsModel->whereIn('city_id', $city_ids);
+        }
 
         if ($is_admin != 1 && $company_id != 0) {
             $result_totle = $LowPriceGoodsModel->where(function ($q) use ($user_id) {
@@ -1034,9 +1058,9 @@ class LowPriceGoods extends Controller
         $city_id_data = $CitysModel->get_city_id_list();
 
         // 过滤空行
-        $data = array_filter($data, function($row) {
+        $data = array_filter($data, function ($row) {
             // 过滤掉所有值都为空的行
-            return !empty(array_filter($row, function($value) {
+            return !empty(array_filter($row, function ($value) {
                 return !is_null($value) && $value !== '';
             }));
         });
@@ -1088,8 +1112,7 @@ class LowPriceGoods extends Controller
                 if ($province_name && in_array($province_name, ['北京市', '天津市', '上海市', '重庆市'])) {
                     //移除市这个字符
                     $province_name = trim(str_replace('市', '', $province_name));
-                }else if ($province_name && in_array($province_name, ['北京', '天津', '上海', '重庆'])) {
-                    
+                } else if ($province_name && in_array($province_name, ['北京', '天津', '上海', '重庆'])) {
                 } else if ($province_name && in_array($province_name, ['内蒙古', '广西', '西藏', '新疆', '宁夏'])) {
                     switch ($province_name) {
                         case '内蒙古':
@@ -1109,7 +1132,6 @@ class LowPriceGoods extends Controller
                             break;
                     }
                 } else if ($province_name && in_array($province_name, ['内蒙古自治区', '广西壮族自治区', '西藏自治区', '新疆维吾尔自治区', '宁夏回族自治区'])) {
-                    
                 } else if (strpos($province_name, '省') === false) {
                     //是否存在市省，如果不存在则补全
                     if (strpos($province_name, '省') === false) {
@@ -1213,15 +1235,14 @@ class LowPriceGoods extends Controller
         }
         if (!$item[21]) {
             return ['code' => 'error', 'msg' => "第{$key}行检索采集日期不能为空", 'data' => $item];
-        }else{
+        } else {
             //校验格式是否为Y-m-d
-            if (!preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/',$item[21])){
+            if (!preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/', $item[21])) {
                 return ['code' => 'error', 'msg' => "第{$key}行检索采集日期格式不正确", 'data' => $item];
             }
-            if (strtotime($item[21]. ' 00:00:00') > time()){
+            if (strtotime($item[21] . ' 00:00:00') > time()) {
                 return ['code' => 'error', 'msg' => "第{$key}行检索采集日期不能大于当前日期", 'data' => $item];
             }
         }
-
     }
 }

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

@@ -59,8 +59,10 @@ class ViolationProduct extends Controller
         $online_posting_count = request('online_posting_count', '');
         $category_name = request('category_name', '');
         $id    = request('id', '');
-        $online_posting_cunt = request('online_posting_cunt','');
+        $online_posting_cunt = request('online_posting_cunt', '');
         $continuous_listing_count = request('continuous_listing_count', '');
+        $province_ids = request('province_ids', '');
+        $city_ids = request('city_ids', '');
         // 时间条件
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
@@ -146,6 +148,16 @@ class ViolationProduct extends Controller
                 $query1->select('violation_product_logid')->fromSub($subQuery, 'sub1');
             });
         }
+        //多选省份
+        if ($province_ids && is_string($province_ids)) {
+            $province_ids = explode(',', $province_ids);
+            $ViolationProductModel = $ViolationProductModel->whereIn('province_id', $province_ids);
+        }
+        //多选城市
+        if ($city_ids && is_string($city_ids)) {
+            $city_ids = explode(',', $city_ids);
+            $ViolationProductModel = $ViolationProductModel->whereIn('city_id', $city_ids);
+        }
 
         if ($is_admin != 1 && $company_id != 0) {
             $result = $ViolationProductModel->where(function ($q) use ($user_id) {
@@ -216,6 +228,8 @@ class ViolationProduct extends Controller
         $product_specs = request('product_specs', '');
         $online_posting_count = request('online_posting_count', '');
         $category_name = request('category_name', '');
+        $province_ids = request('province_ids', '');
+        $city_ids = request('city_ids', '');
         // 时间条件
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
@@ -297,6 +311,16 @@ class ViolationProduct extends Controller
                 $query1->select('violation_product_logid')->fromSub($subQuery, 'sub1');
             });
         }
+        //多选省份
+        if ($province_ids && is_string($province_ids)) {
+            $province_ids = explode(',', $province_ids);
+            $ViolationProductModel = $ViolationProductModel->whereIn('province_id', $province_ids);
+        }
+        //多选城市
+        if ($city_ids && is_string($city_ids)) {
+            $city_ids = explode(',', $city_ids);
+            $ViolationProductModel = $ViolationProductModel->whereIn('city_id', $city_ids);
+        }
 
         if ($is_admin != 1 && $company_id != 0) {
             $result_totle = $ViolationProductModel->where(function ($q) use ($user_id) {
@@ -840,9 +864,9 @@ class ViolationProduct extends Controller
         $city_id_data = $CitysModel->get_city_id_list();
 
         // 过滤空行
-        $data = array_filter($data, function($row) {
+        $data = array_filter($data, function ($row) {
             // 过滤掉所有值都为空的行
-            return !empty(array_filter($row, function($value) {
+            return !empty(array_filter($row, function ($value) {
                 return !is_null($value) && $value !== '';
             }));
         });
@@ -893,8 +917,7 @@ class ViolationProduct extends Controller
                 if ($province_name && in_array($province_name, ['北京市', '天津市', '上海市', '重庆市'])) {
                     //移除市这个字符
                     $province_name = trim(str_replace('市', '', $province_name));
-                }else if ($province_name && in_array($province_name, ['北京', '天津', '上海', '重庆'])) {
-                    
+                } else if ($province_name && in_array($province_name, ['北京', '天津', '上海', '重庆'])) {
                 } else if ($province_name && in_array($province_name, ['内蒙古', '广西', '西藏', '新疆', '宁夏'])) {
                     switch ($province_name) {
                         case '内蒙古':
@@ -914,14 +937,13 @@ class ViolationProduct extends Controller
                             break;
                     }
                 } else if ($province_name && in_array($province_name, ['内蒙古自治区', '广西壮族自治区', '西藏自治区', '新疆维吾尔自治区', '宁夏回族自治区'])) {
-                    
                 } else if (strpos($province_name, '省') === false) {
                     //是否存在市省，如果不存在则补全
                     if (strpos($province_name, '省') === false) {
                         $province_name = $province_name . '省';
                     }
                 }
-                
+
                 if (!isset($province_id_data[$province_name])) return json_send(['code' => 'error', 'msg' => "第{$key_num}行省份信息不完整", 'data' => $item]);
                 $city_name = $item[17];
                 if (!isset($city_id_data[$city_name])) return json_send(['code' => 'error', 'msg' => "第{$key_num}行城市信息不完整", 'data' => $item]);
@@ -1010,12 +1032,12 @@ class ViolationProduct extends Controller
         }
         if (!$item[19]) {
             return ['code' => 'error', 'msg' => "第{$key}行检索采集日期不能为空", 'data' => $item];
-        }else{
+        } else {
             //校验格式是否为Y-m-d
-            if (!preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/',$item[19])){
+            if (!preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/', $item[19])) {
                 return ['code' => 'error', 'msg' => "第{$key}行检索采集日期格式不正确", 'data' => $item];
             }
-            if (strtotime($item[19]. ' 00:00:00') > time()){
+            if (strtotime($item[19] . ' 00:00:00') > time()) {
                 return ['code' => 'error', 'msg' => "第{$key}行检索采集日期不能大于当前日期", 'data' => $item];
             }
         }

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

@@ -52,6 +52,8 @@ class ViolationStore extends Controller
         $product_specs = request('product_specs', '');
         $online_posting_count = request('online_posting_count', '');
         $id    = request('id', '');
+        $province_ids = request('province_ids', '');
+        $city_ids = request('city_ids', '');
         // 时间条件
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
@@ -127,6 +129,16 @@ class ViolationStore extends Controller
                 $query1->select('violation_store_logid')->fromSub($subQuery, 'sub1');
             });
         }
+        //多选省份
+        if ($province_ids && is_string($province_ids)) {
+            $province_ids = explode(',', $province_ids);
+            $ViolationStoreModel = $ViolationStoreModel->whereIn('province_id', $province_ids);
+        }
+        //多选城市
+        if ($city_ids && is_string($city_ids)) {
+            $city_ids = explode(',', $city_ids);
+            $ViolationStoreModel = $ViolationStoreModel->whereIn('city_id', $city_ids);
+        }
         // 查询数据
         if ($is_admin != 1 && $company_id != 0) {
             $result = $ViolationStoreModel->where(function ($q) use ($user_id) {
@@ -193,6 +205,8 @@ class ViolationStore extends Controller
         $processing_status = request('processing_status', '');
         $product_specs = request('product_specs', '');
         $online_posting_count = request('online_posting_count', '');
+        $province_ids = request('province_ids', '');
+        $city_ids = request('city_ids', '');
         // 时间条件
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
@@ -266,6 +280,16 @@ class ViolationStore extends Controller
                 $query1->select('violation_store_logid')->fromSub($subQuery, 'sub1');
             });
         }
+        //多选省份
+        if ($province_ids && is_string($province_ids)) {
+            $province_ids = explode(',', $province_ids);
+            $ViolationStoreModel = $ViolationStoreModel->whereIn('province_id', $province_ids);
+        }
+        //多选城市
+        if ($city_ids && is_string($city_ids)) {
+            $city_ids = explode(',', $city_ids);
+            $ViolationStoreModel = $ViolationStoreModel->whereIn('city_id', $city_ids);
+        }
 
         if ($is_admin != 1 && $company_id != 0) {
             $result_totle = $ViolationStoreModel->where(function ($q) use ($user_id) {