[智价云] 导出筛选时间补充

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

@@ -266,6 +266,8 @@ class LowPriceGoods extends Controller
         $message_data['shipment_province_ids'] = request('shipment_province_ids', '');
         $message_data['shipment_city_ids'] = request('shipment_city_ids', '');
         $message_data['product_brand'] = request('product_brand', '');
+        $message_data['collection_time_start_time'] = request('collection_time_start_time', '');
+        $message_data['collection_time_end_time'] = request('product_brand', '');
 
         $low_price_goods_where = [];
         // 权限判断
@@ -306,7 +308,12 @@ class LowPriceGoods extends Controller
         $shipment_province_ids = $message_data['shipment_province_ids'] ?? '';
         $shipment_city_ids = $message_data['shipment_city_ids'] ?? '';
         $product_brand = $message_data['product_brand'] ?? '';
+
+        $collection_time_start_time = $message_data['collection_time_start_time'] ?? '';
+        $collection_time_end_time = $message_data['collection_time_end_time'] ?? '';
         // 时间条件
+        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)];
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
         // 其他条件
@@ -920,7 +927,7 @@ class LowPriceGoods extends Controller
         $sheet->setCellValue('A2', '第一责任人姓名');
         $sheet->setCellValue('B2', '责任人姓名');
         $sheet->setCellValue('C2', '平台名称*');
-        $sheet->setCellValue('D2', '商品分类名称');
+        $sheet->setCellValue('D2', '商品类型');
         $sheet->setCellValue('E2', '品牌名称');
         $sheet->setCellValue('F2', '商品名称*');
         $sheet->setCellValue('G2', '商品规格*');
@@ -935,7 +942,7 @@ class LowPriceGoods extends Controller
         $sheet->setCellValue('P2', '店铺名称*');
         $sheet->setCellValue('Q2', '匿名店铺');
         $sheet->setCellValue('R2', '公司名称*');
-        $sheet->setCellValue('S2', '公司分类名称');
+        $sheet->setCellValue('S2', '商业类型');
         $sheet->setCellValue('T2', '信用代码');
         $sheet->setCellValue('U2', '省份');
         $sheet->setCellValue('V2', '城市');

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

@@ -266,6 +266,8 @@ class ViolationProduct extends Controller
         $message_data['shipment_province_ids'] = request('shipment_province_ids', '');
         $message_data['shipment_city_ids'] = request('shipment_city_ids', '');
         $message_data['product_brand'] = request('product_brand', '');
+        $message_data['collection_time_start_time'] = request('collection_time_start_time', '');
+        $message_data['collection_time_end_time'] = request('collection_time_end_time', '');
 
         $violation_product_where = [];
         // 权限判断
@@ -309,7 +311,11 @@ class ViolationProduct extends Controller
         $shipment_province_ids = $message_data['shipment_province_ids'] ?? '';
         $shipment_city_ids = $message_data['shipment_city_ids'] ?? '';
         $product_brand = $message_data['product_brand'];
+        $collection_time_start_time = $message_data['collection_time_start_time'];
+        $collection_time_end_time = $message_data['collection_time_end_time'];
         // 时间条件
+        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)];
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
         // 其他条件

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

@@ -218,7 +218,11 @@ class ViolationStore extends Controller
         $online_posting_count = request('online_posting_count', '');
         $province_ids = request('province_ids', '');
         $city_ids = request('city_ids', '');
+        $collection_time_start_time = request('collection_time_start_time', '');
+        $collection_time_end_time = request('collection_time_end_time', '');
         // 时间条件
+        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)];
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
         //其它条件

app/Jobs/Manager/Other/ExportLowPriceGoodsJobs.php

@@ -115,8 +115,12 @@ class ExportLowPriceGoodsJobs implements ShouldQueue
         $shipment_province_ids = $message_data['shipment_province_ids'] ?? '';
         $shipment_city_ids = $message_data['shipment_city_ids'] ?? '';
         $product_brand = $message_data['product_brand'] ?? '';
+        $collection_time_start_time = $message_data['collection_time_start_time'] ?? '';
+        $collection_time_end_time = $message_data['collection_time_end_time'] ?? '';
 
         // 时间条件
+        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)];
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
         // 其他条件

app/Jobs/Manager/Other/ExportViolationProductJobs.php

@@ -112,7 +112,11 @@ class ExportViolationProductJobs implements ShouldQueue
         $shipment_province_ids = $message_data['shipment_province_ids'] ?? '';
         $shipment_city_ids = $message_data['shipment_city_ids'] ?? '';
         $product_brand = $message_data['product_brand'];
+        $collection_time_start_time = $message_data['collection_time_start_time'] ?? '';
+        $collection_time_end_time = $message_data['collection_time_end_time'] ?? '';
         // 时间条件
+        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)];
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
         // 其他条件