[智价云] 统计查询更新

app/Http/Controllers/Manager/Statistics/BasicPanel.php

@@ -90,12 +90,15 @@ class BasicPanel extends Controller
         $productModel_map3 = [];
         if ($start_time && $end_time) {
             $productModel_map1[] = ['sampling_start_time', '>=', $start_time];
+            $productModel_map1[] = ['sampling_start_time', '<=', $end_time];
             $productModel_map1[] = ['sampling_end_time', '<=', $end_time];
 
             $productModel_map2[] = ['sampling_start_time', '>=', $start_time];
+            $productModel_map2[] = ['sampling_start_time', '<=', $end_time];
             $productModel_map2[] = ['sampling_end_time', '>=', $end_time];
 
             $productModel_map3[] = ['sampling_start_time', '>=', $start_time];
+            $productModel_map3[] = ['sampling_start_time', '<=', $end_time];
             $productModel_map3[] = ['sampling_end_time', '=', '0'];
         }
         if ($is_admin != 1 && $company_id != 0) {
@@ -177,12 +180,15 @@ class BasicPanel extends Controller
         $productModel_map3 = [];
         if ($start_time && $end_time) {
             $productModel_map1[] = ['sampling_start_time', '>=', $start_time];
+            $productModel_map1[] = ['sampling_start_time', '<=', $end_time];
             $productModel_map1[] = ['sampling_end_time', '<=', $end_time];
 
             $productModel_map2[] = ['sampling_start_time', '>=', $start_time];
+            $productModel_map2[] = ['sampling_start_time', '<=', $end_time];
             $productModel_map2[] = ['sampling_end_time', '>=', $end_time];
 
             $productModel_map3[] = ['sampling_start_time', '>=', $start_time];
+            $productModel_map3[] = ['sampling_start_time', '<=', $end_time];
             $productModel_map3[] = ['sampling_end_time', '=', '0'];
         }
         if ($is_admin != 1 && $company_id != 0) {
@@ -261,12 +267,15 @@ class BasicPanel extends Controller
         $productModel_map3 = [];
         if ($start_time && $end_time) {
             $productModel_map1[] = ['sampling_start_time', '>=', $start_time];
+            $productModel_map1[] = ['sampling_start_time', '<=', $end_time];
             $productModel_map1[] = ['sampling_end_time', '<=', $end_time];
 
             $productModel_map2[] = ['sampling_start_time', '>=', $start_time];
+            $productModel_map2[] = ['sampling_start_time', '<=', $end_time];
             $productModel_map2[] = ['sampling_end_time', '>=', $end_time];
 
             $productModel_map3[] = ['sampling_start_time', '>=', $start_time];
+            $productModel_map3[] = ['sampling_start_time', '<=', $end_time];
             $productModel_map3[] = ['sampling_end_time', '=', '0'];
         }
         if ($is_admin != 1 && $company_id != 0) {