|
@@ -3544,7 +3544,7 @@ class StatisticsController extends Controller
|
3544
|
3544
|
if($admin_id) $query->where('admin_id', $admin_id);
|
3545
|
3545
|
if(!empty($sale_ids)) $query->whereIn('admin_id', $sale_ids);
|
3546
|
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
|
3548
|
})->count();
|
3549
|
3549
|
|
3550
|
3550
|
if ($count > 1) {
|
|
@@ -3559,7 +3559,7 @@ class StatisticsController extends Controller
|
3559
|
3559
|
if($admin_id) $query->where('admin_id', $admin_id);
|
3560
|
3560
|
if(!empty($sale_ids)) $query->whereIn('admin_id', $sale_ids);
|
3561
|
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
|
3563
|
})->orderBy('month', 'desc')->offset($offset)->limit($pageSize)->get();
|
3564
|
3564
|
|
3565
|
3565
|
if($mstime){
|
|
@@ -3764,7 +3764,7 @@ class StatisticsController extends Controller
|
3764
|
3764
|
if($admin_id) $query->where('admin_id', $admin_id);
|
3765
|
3765
|
if(!empty($sale_ids)) $query->whereIn('admin_id', $sale_ids);
|
3766
|
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
|
3768
|
})->orderBy('month', 'desc')->get();
|
3769
|
3769
|
|
3770
|
3770
|
if($mstime){
|