|
@@ -95,8 +95,8 @@ class GameStatisModel extends Model
|
|
|
];
|
|
];
|
|
|
|
|
|
|
|
// 时间筛选
|
|
// 时间筛选
|
|
|
- $startTime = !empty($filters['start_date']) ? strtotime($filters['start_date']) : strtotime(date('Y-m-d'));
|
|
|
|
|
- $endTime = !empty($filters['end_date']) ? strtotime($filters['end_date'] . ' 23:59:59') : strtotime(date('Y-m-d 23:59:59'));
|
|
|
|
|
|
|
+ $startTime = !empty($filters['start_time']) ? strtotime($filters['start_time']) : strtotime(date('Y-m-d'));
|
|
|
|
|
+ $endTime = !empty($filters['end_time']) ? strtotime($filters['end_time'] . ' 23:59:59') : strtotime(date('Y-m-d 23:59:59'));
|
|
|
|
|
|
|
|
$where[] = ['create_time', '>=', $startTime];
|
|
$where[] = ['create_time', '>=', $startTime];
|
|
|
$where[] = ['create_time', '<=', $endTime];
|
|
$where[] = ['create_time', '<=', $endTime];
|
|
@@ -176,8 +176,8 @@ class GameStatisModel extends Model
|
|
|
];
|
|
];
|
|
|
|
|
|
|
|
// 时间筛选
|
|
// 时间筛选
|
|
|
- $startTime = !empty($filters['start_date']) ? strtotime($filters['start_date']) : strtotime(date('Y-m-d'));
|
|
|
|
|
- $endTime = !empty($filters['end_date']) ? strtotime($filters['end_date'] . ' 23:59:59') : strtotime(date('Y-m-d 23:59:59'));
|
|
|
|
|
|
|
+ $startTime = !empty($filters['start_time']) ? strtotime($filters['start_time']) : strtotime(date('Y-m-d'));
|
|
|
|
|
+ $endTime = !empty($filters['end_time']) ? strtotime($filters['end_time'] . ' 23:59:59') : strtotime(date('Y-m-d 23:59:59'));
|
|
|
|
|
|
|
|
$where[] = ['create_time', '>=', $startTime];
|
|
$where[] = ['create_time', '>=', $startTime];
|
|
|
$where[] = ['create_time', '<=', $endTime];
|
|
$where[] = ['create_time', '<=', $endTime];
|
|
@@ -210,8 +210,8 @@ class GameStatisModel extends Model
|
|
|
$levelList = self::table($subQuery . ' t')
|
|
$levelList = self::table($subQuery . ' t')
|
|
|
->page($page, $limit)
|
|
->page($page, $limit)
|
|
|
->select()
|
|
->select()
|
|
|
- ->toArray();
|
|
|
|
|
-
|
|
|
|
|
|
|
+ ->toArray();
|
|
|
|
|
+
|
|
|
// 获取总体统计数据(用于计算占比)
|
|
// 获取总体统计数据(用于计算占比)
|
|
|
$totalStats = self::where($where)
|
|
$totalStats = self::where($where)
|
|
|
->field([
|
|
->field([
|