|
@@ -3812,7 +3812,7 @@ class StatisticsController extends Controller
|
3812
|
3812
|
if($stime) $query->where('send_time', '>=', $stime);
|
3813
|
3813
|
if($etime) $query->where('send_time', '<=', $etime);
|
3814
|
3814
|
if($warehouse>0) $query->where('warehouse', '=', $warehouse);
|
3815
|
|
- })->whereNotNull('send_time')->where('logistics_id','>','')->where('is_del', 0)->groupBy('warehouse')->groupBy('send_time')->get();
|
|
3815
|
+ })->whereNotNull('send_time')->where('warehouse','>',0)->where('logistics_id','>','')->where('is_del', 0)->groupBy('warehouse')->groupBy('send_time')->get();
|
3816
|
3816
|
$count = count($count);
|
3817
|
3817
|
if ($count > 1) {
|
3818
|
3818
|
// 总页数
|
|
@@ -3827,7 +3827,7 @@ class StatisticsController extends Controller
|
3827
|
3827
|
if($stime) $query->where('send_time', '>=', $stime);
|
3828
|
3828
|
if($etime) $query->where('send_time', '<=', $etime);
|
3829
|
3829
|
if($warehouse>0) $query->where('warehouse', '=', $warehouse);
|
3830
|
|
- })->whereNotNull('send_time')->where('logistics_id','>','')->where('is_del', 0)->groupBy('warehouse')->groupBy('send_time')->orderBy('send_time', 'desc')->offset($offset)->limit($pageSize)->get();
|
|
3830
|
+ })->whereNotNull('send_time')->where('warehouse','>',0)->where('logistics_id','>','')->where('is_del', 0)->groupBy('warehouse')->groupBy('send_time')->orderBy('send_time', 'desc')->offset($offset)->limit($pageSize)->get();
|
3831
|
3831
|
|
3832
|
3832
|
$wareArr = array(
|
3833
|
3833
|
0 => '其他',
|
|
@@ -3861,7 +3861,7 @@ class StatisticsController extends Controller
|
3861
|
3861
|
if($stime) $query->where('send_time', '>=', $stime);
|
3862
|
3862
|
if($etime) $query->where('send_time', '<=', $etime);
|
3863
|
3863
|
if($warehouse>0) $query->where('warehouse', '=', $warehouse);
|
3864
|
|
- })->whereNotNull('send_time')->where('logistics_id','>','')->where('is_del', 0)->groupBy('warehouse')->groupBy('send_time')->orderBy('send_time', 'desc')->get();
|
|
3864
|
+ })->whereNotNull('send_time')->where('warehouse','>',0)->where('logistics_id','>','')->where('is_del', 0)->groupBy('warehouse')->groupBy('send_time')->orderBy('send_time', 'desc')->get();
|
3865
|
3865
|
|
3866
|
3866
|
$wareArr = array(
|
3867
|
3867
|
0 => '其他',
|