sunhao 5 years ago
parent
commit
27256f836d
1 changed files with 3 additions and 3 deletions
  1. 3 3
      app/Http/Controllers/Admin/StatisticsController.php

+ 3 - 3
app/Http/Controllers/Admin/StatisticsController.php

3544
             if($admin_id) $query->where('admin_id', $admin_id);
3544
             if($admin_id) $query->where('admin_id', $admin_id);
3545
             if(!empty($sale_ids)) $query->whereIn('admin_id', $sale_ids);
3545
             if(!empty($sale_ids)) $query->whereIn('admin_id', $sale_ids);
3546
             if(!empty($mstime)) $query->where('month', '>=', $mstime);
3546
             if(!empty($mstime)) $query->where('month', '>=', $mstime);
3547
-            if(!empty($metime)) $query->where('month', '<', $metime);
3547
+            if(!empty($metime)) $query->where('month', '<=', $metime);
3548
         })->count();
3548
         })->count();
3549
         
3549
         
3550
         if ($count > 1) {
3550
         if ($count > 1) {
3559
             if($admin_id) $query->where('admin_id', $admin_id);
3559
             if($admin_id) $query->where('admin_id', $admin_id);
3560
             if(!empty($sale_ids)) $query->whereIn('admin_id', $sale_ids);
3560
             if(!empty($sale_ids)) $query->whereIn('admin_id', $sale_ids);
3561
             if(!empty($mstime)) $query->where('month', '>=', $mstime);
3561
             if(!empty($mstime)) $query->where('month', '>=', $mstime);
3562
-            if(!empty($metime)) $query->where('month', '<', $metime);
3562
+            if(!empty($metime)) $query->where('month', '<=', $metime);
3563
         })->orderBy('month', 'desc')->offset($offset)->limit($pageSize)->get();
3563
         })->orderBy('month', 'desc')->offset($offset)->limit($pageSize)->get();
3564
 
3564
 
3565
         if($mstime){
3565
         if($mstime){
3764
             if($admin_id) $query->where('admin_id', $admin_id);
3764
             if($admin_id) $query->where('admin_id', $admin_id);
3765
             if(!empty($sale_ids)) $query->whereIn('admin_id', $sale_ids);
3765
             if(!empty($sale_ids)) $query->whereIn('admin_id', $sale_ids);
3766
             if(!empty($mstime)) $query->where('month', '>=', $mstime);
3766
             if(!empty($mstime)) $query->where('month', '>=', $mstime);
3767
-            if(!empty($metime)) $query->where('month', '<', $metime);
3767
+            if(!empty($metime)) $query->where('month', '<=', $metime);
3768
         })->orderBy('month', 'desc')->get();
3768
         })->orderBy('month', 'desc')->get();
3769
 
3769
 
3770
         if($mstime){
3770
         if($mstime){