|
|
@@ -43,7 +43,7 @@ class OverviewPanel extends Controller
|
|
|
$start_time = $start_time_string? strtotime($start_time_string.' 00:00:00') : $yesterdayStart;
|
|
|
$end_time = $end_time_string? strtotime($end_time_string.' 23:59:59') : $yesterdayEnd;
|
|
|
$todayStart = Carbon::today()->startOfDay()->getTimestamp(); // 今天开始时间 00:00:00
|
|
|
- if($start_time > $todayStart || $end_time > $todayStart) return json_send(['code' => 'error', 'msg' => '不支持查询今天及以后时间', 'data' => '']);
|
|
|
+ if($start_time > $todayStart || $end_time > $todayStart) return json_send(['code' => 'error', 'msg' => '不支持查询今天或以后时间', 'data' => '']);
|
|
|
//校验开始时间结束时间是否在同一天
|
|
|
if(date('Y-m-d', $start_time)!= date('Y-m-d', $end_time)) return json_send(['code' => 'error', 'msg' => '开始时间和结束时间必须在同一天', 'data' => '']);
|
|
|
// 时间条件
|
|
|
@@ -72,7 +72,7 @@ class OverviewPanel extends Controller
|
|
|
$start_time = $start_time_string? strtotime($start_time_string.' 00:00:00') : $yesterdayStart;
|
|
|
$end_time = $end_time_string? strtotime($end_time_string.' 23:59:59') : $yesterdayEnd;
|
|
|
$todayStart = Carbon::today()->startOfDay()->getTimestamp(); // 今天开始时间 00:00:00
|
|
|
- if($start_time > $todayStart || $end_time > $todayStart) return json_send(['code' => 'error', 'msg' => '不支持查询今天及以后时间', 'data' => '']);
|
|
|
+ if($start_time > $todayStart || $end_time > $todayStart) return json_send(['code' => 'error', 'msg' => '不支持查询今天或以后时间', 'data' => '']);
|
|
|
//校验开始时间结束时间是否在同一天
|
|
|
if(date('Y-m-d', $start_time)!= date('Y-m-d', $end_time)) return json_send(['code' => 'error', 'msg' => '开始时间和结束时间必须在同一天', 'data' => '']);
|
|
|
// 时间条件
|
|
|
@@ -158,7 +158,7 @@ class OverviewPanel extends Controller
|
|
|
$start_time = $start_time_string? strtotime($start_time_string.' 00:00:00') : $yesterdayStart;
|
|
|
$end_time = $end_time_string? strtotime($end_time_string.' 23:59:59') : $yesterdayEnd;
|
|
|
$todayStart = Carbon::today()->startOfDay()->getTimestamp(); // 今天开始时间 00:00:00
|
|
|
- if($start_time > $todayStart || $end_time > $todayStart) return json_send(['code' => 'error', 'msg' => '不支持查询今天及以后时间', 'data' => '']);
|
|
|
+ if($start_time > $todayStart || $end_time > $todayStart) return json_send(['code' => 'error', 'msg' => '不支持查询今天或以后时间', 'data' => '']);
|
|
|
//校验开始时间结束时间是否在同一个月
|
|
|
if(date('Y-m', $start_time)!= date('Y-m', $end_time)) return json_send(['code' => 'error', 'msg' => '开始时间和结束时间必须在同一个月', 'data' => '']);
|
|
|
// 时间条件
|
|
|
@@ -187,7 +187,7 @@ class OverviewPanel extends Controller
|
|
|
$start_time = $start_time_string? strtotime($start_time_string.' 00:00:00') : $yesterdayStart;
|
|
|
$end_time = $end_time_string? strtotime($end_time_string.' 23:59:59') : $yesterdayEnd;
|
|
|
$todayStart = Carbon::today()->startOfDay()->getTimestamp(); // 今天开始时间 00:00:00
|
|
|
- if($start_time > $todayStart || $end_time > $todayStart) return json_send(['code' => 'error', 'msg' => '不支持查询今天及以后时间', 'data' => '']);
|
|
|
+ if($start_time > $todayStart || $end_time > $todayStart) return json_send(['code' => 'error', 'msg' => '不支持查询今天或以后时间', 'data' => '']);
|
|
|
//校验开始时间结束时间是否在同一个月
|
|
|
if(date('Y-m', $start_time)!= date('Y-m', $end_time)) return json_send(['code' => 'error', 'msg' => '开始时间和结束时间必须在同一个月', 'data' => '']);
|
|
|
// 时间条件
|
|
|
@@ -274,7 +274,7 @@ class OverviewPanel extends Controller
|
|
|
$start_time = $start_time_string? strtotime($start_time_string.' 00:00:00') : $yesterdayStart;
|
|
|
$end_time = $end_time_string? strtotime($end_time_string.' 23:59:59') : $yesterdayEnd;
|
|
|
$todayStart = Carbon::today()->startOfDay()->getTimestamp(); // 今天开始时间 00:00:00
|
|
|
- if($start_time > $todayStart || $end_time > $todayStart) return json_send(['code' => 'error', 'msg' => '不支持查询今天及以后时间', 'data' => '']);
|
|
|
+ if($start_time > $todayStart || $end_time > $todayStart) return json_send(['code' => 'error', 'msg' => '不支持查询今天或以后时间', 'data' => '']);
|
|
|
//校验开始时间结束时间是否在同一天
|
|
|
if(date('Y-m-d', $start_time)!= date('Y-m-d', $end_time)) return json_send(['code' => 'error', 'msg' => '开始时间和结束时间必须在同一天', 'data' => '']);
|
|
|
// 时间条件
|
|
|
@@ -303,7 +303,7 @@ class OverviewPanel extends Controller
|
|
|
$start_time = $start_time_string? strtotime($start_time_string.' 00:00:00') : $yesterdayStart;
|
|
|
$end_time = $end_time_string? strtotime($end_time_string.' 23:59:59') : $yesterdayEnd;
|
|
|
$todayStart = Carbon::today()->startOfDay()->getTimestamp(); // 今天开始时间 00:00:00
|
|
|
- if($start_time > $todayStart || $end_time > $todayStart) return json_send(['code' => 'error', 'msg' => '不支持查询今天及以后时间', 'data' => '']);
|
|
|
+ if($start_time > $todayStart || $end_time > $todayStart) return json_send(['code' => 'error', 'msg' => '不支持查询今天或以后时间', 'data' => '']);
|
|
|
//校验开始时间结束时间是否在同一天
|
|
|
if(date('Y-m-d', $start_time)!= date('Y-m-d', $end_time)) return json_send(['code' => 'error', 'msg' => '开始时间和结束时间必须在同一天', 'data' => '']);
|
|
|
// 时间条件
|
|
|
@@ -389,7 +389,7 @@ class OverviewPanel extends Controller
|
|
|
$start_time = $start_time_string? strtotime($start_time_string.' 00:00:00') : $yesterdayStart;
|
|
|
$end_time = $end_time_string? strtotime($end_time_string.' 23:59:59') : $yesterdayEnd;
|
|
|
$todayStart = Carbon::today()->startOfDay()->getTimestamp(); // 今天开始时间 00:00:00
|
|
|
- if($start_time > $todayStart || $end_time > $todayStart) return json_send(['code' => 'error', 'msg' => '不支持查询今天及以后时间', 'data' => '']);
|
|
|
+ if($start_time > $todayStart || $end_time > $todayStart) return json_send(['code' => 'error', 'msg' => '不支持查询今天或以后时间', 'data' => '']);
|
|
|
//校验开始时间结束时间是否在同一个月
|
|
|
if(date('Y-m', $start_time)!= date('Y-m', $end_time)) return json_send(['code' => 'error', 'msg' => '开始时间和结束时间必须在同一个月', 'data' => '']);
|
|
|
// 时间条件
|
|
|
@@ -418,7 +418,7 @@ class OverviewPanel extends Controller
|
|
|
$start_time = $start_time_string? strtotime($start_time_string.' 00:00:00') : $yesterdayStart;
|
|
|
$end_time = $end_time_string? strtotime($end_time_string.' 23:59:59') : $yesterdayEnd;
|
|
|
$todayStart = Carbon::today()->startOfDay()->getTimestamp(); // 今天开始时间 00:00:00
|
|
|
- if($start_time > $todayStart || $end_time > $todayStart) return json_send(['code' => 'error', 'msg' => '不支持查询今天及以后时间', 'data' => '']);
|
|
|
+ if($start_time > $todayStart || $end_time > $todayStart) return json_send(['code' => 'error', 'msg' => '不支持查询今天或以后时间', 'data' => '']);
|
|
|
//校验开始时间结束时间是否在同一个月
|
|
|
if(date('Y-m', $start_time)!= date('Y-m', $end_time)) return json_send(['code' => 'error', 'msg' => '开始时间和结束时间必须在同一个月', 'data' => '']);
|
|
|
// 时间条件
|