|
@@ -13,7 +13,7 @@ class StatisticsService extends Service
|
|
$model = RevenueCostTotal::where('del_time',0)
|
|
$model = RevenueCostTotal::where('del_time',0)
|
|
->select($field)
|
|
->select($field)
|
|
->orderby('id', 'desc');
|
|
->orderby('id', 'desc');
|
|
- if(! empty($data['order_time'])){
|
|
|
|
|
|
+ if(! empty($data['order_time'][0]) && ! empty($data['order_time'][1])){
|
|
list($start_time, $end_time) = $this->changeDateToTimeStampAboutRange($data['order_time'],false);
|
|
list($start_time, $end_time) = $this->changeDateToTimeStampAboutRange($data['order_time'],false);
|
|
if ($start_time === null || $end_time === null || $start_time > $end_time) return [false, "单据日期的区间无效"];
|
|
if ($start_time === null || $end_time === null || $start_time > $end_time) return [false, "单据日期的区间无效"];
|
|
$model->where('order_time', '>=', $start_time)
|
|
$model->where('order_time', '>=', $start_time)
|
|
@@ -110,7 +110,7 @@ class StatisticsService extends Service
|
|
->where('order_type',$data['order_type'])
|
|
->where('order_type',$data['order_type'])
|
|
->select($field)
|
|
->select($field)
|
|
->orderby('id', 'desc');
|
|
->orderby('id', 'desc');
|
|
- if(! empty($data['order_time'])){
|
|
|
|
|
|
+ if(! empty($data['order_time'][0]) && ! empty($data['order_time'][1])){
|
|
list($start_time, $end_time) = $this->changeDateToTimeStampAboutRange($data['order_time'],false);
|
|
list($start_time, $end_time) = $this->changeDateToTimeStampAboutRange($data['order_time'],false);
|
|
if ($start_time === null || $end_time === null || $start_time > $end_time) return [false, "单据日期的区间无效"];
|
|
if ($start_time === null || $end_time === null || $start_time > $end_time) return [false, "单据日期的区间无效"];
|
|
$model->where('order_time', '>=', $start_time)
|
|
$model->where('order_time', '>=', $start_time)
|
|
@@ -156,7 +156,7 @@ class StatisticsService extends Service
|
|
->select($field)
|
|
->select($field)
|
|
->groupby('order_id')
|
|
->groupby('order_id')
|
|
->orderby('id', 'desc');
|
|
->orderby('id', 'desc');
|
|
- if(! empty($data['order_time'])){
|
|
|
|
|
|
+ if(! empty($data['order_time'][0]) && ! empty($data['order_time'][1])){
|
|
list($start_time, $end_time) = $this->changeDateToTimeStampAboutRange($data['order_time'],false);
|
|
list($start_time, $end_time) = $this->changeDateToTimeStampAboutRange($data['order_time'],false);
|
|
if ($start_time === null || $end_time === null || $start_time > $end_time) return [false, "单据日期的区间无效"];
|
|
if ($start_time === null || $end_time === null || $start_time > $end_time) return [false, "单据日期的区间无效"];
|
|
$model->where('order_time', '>=', $start_time)
|
|
$model->where('order_time', '>=', $start_time)
|