|
|
@ -1070,7 +1070,7 @@ class QueryController extends BaseController
|
|
|
|
{
|
|
|
|
{
|
|
|
|
$relationGameId = intval(I('relation_game_id', 0));
|
|
|
|
$relationGameId = intval(I('relation_game_id', 0));
|
|
|
|
$sdkVersion = intval(I('sdk_version', 0));
|
|
|
|
$sdkVersion = intval(I('sdk_version', 0));
|
|
|
|
$serverId = intval(I('server_id'), 0);
|
|
|
|
$serverId = I('server_id', '');
|
|
|
|
$nowTime = date('Y-m-d');
|
|
|
|
$nowTime = date('Y-m-d');
|
|
|
|
$initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime)));
|
|
|
|
$initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime)));
|
|
|
|
$initBegTime = empty(I('begtime')) ? $initBegTime : I('begtime');
|
|
|
|
$initBegTime = empty(I('begtime')) ? $initBegTime : I('begtime');
|
|
|
@ -1110,7 +1110,7 @@ class QueryController extends BaseController
|
|
|
|
$params['game_id'] = ['in', $gameIds];
|
|
|
|
$params['game_id'] = ['in', $gameIds];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ($serverId > 0) {
|
|
|
|
if (!empty($serverId)) {
|
|
|
|
$params['server_id'] = $serverId;
|
|
|
|
$params['server_id'] = $serverId;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$params['begin_time'] = $begTime;
|
|
|
|
$params['begin_time'] = $begTime;
|
|
|
@ -1230,7 +1230,7 @@ class QueryController extends BaseController
|
|
|
|
$ownId = intval(I('own_id'), 0);//本账号
|
|
|
|
$ownId = intval(I('own_id'), 0);//本账号
|
|
|
|
$relationGameId = intval(I('relation_game_id', 0));
|
|
|
|
$relationGameId = intval(I('relation_game_id', 0));
|
|
|
|
$sdkVersion = intval(I('sdk_version', 0));
|
|
|
|
$sdkVersion = intval(I('sdk_version', 0));
|
|
|
|
$serverId = intval(I('server_id'), 0);
|
|
|
|
$serverId = I('server_id', '');
|
|
|
|
$nowTime = date('Y-m-d');
|
|
|
|
$nowTime = date('Y-m-d');
|
|
|
|
$initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime)));
|
|
|
|
$initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime)));
|
|
|
|
$initBegTime = empty(I('begtime')) ? $initBegTime : I('begtime');
|
|
|
|
$initBegTime = empty(I('begtime')) ? $initBegTime : I('begtime');
|
|
|
@ -1276,7 +1276,7 @@ class QueryController extends BaseController
|
|
|
|
$map['a.sdk_version'] = $sdkVersion;
|
|
|
|
$map['a.sdk_version'] = $sdkVersion;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$serverJoin = '';
|
|
|
|
$serverJoin = '';
|
|
|
|
if ($serverId > 0) {
|
|
|
|
if (!empty($serverId)) {
|
|
|
|
$serverJoin = 'tab_server as s on s.game_id = a.game_id';
|
|
|
|
$serverJoin = 'tab_server as s on s.game_id = a.game_id';
|
|
|
|
$map['s.server_id'] = $serverId;
|
|
|
|
$map['s.server_id'] = $serverId;
|
|
|
|
$params['server_id'] = $serverId;
|
|
|
|
$params['server_id'] = $serverId;
|
|
|
|