|
|
|
@ -1814,7 +1814,7 @@ class DownloadController extends BaseController {
|
|
|
|
|
array('create_time','创建时间'),
|
|
|
|
|
);
|
|
|
|
|
$model = M('user_play_info','tab_');
|
|
|
|
|
$data = $model->field('user_account,promote_account,game_name,server_name,role_name,role_level')->where($map)->order('create_time desc')->select();
|
|
|
|
|
$data = $model->field('user_account,promote_account,game_name,server_name,role_name,role_level,create_time')->where($map)->order('create_time desc')->select();
|
|
|
|
|
$xlsData = [];
|
|
|
|
|
foreach ($data as $key1 => $value1) {
|
|
|
|
|
$value1['user_account'] = $this->encryption($value1['user_account']);
|
|
|
|
@ -1875,7 +1875,7 @@ class DownloadController extends BaseController {
|
|
|
|
|
->join($serverJoin)//关联区服表
|
|
|
|
|
->where($map)
|
|
|
|
|
->group('tab_apply.game_id')
|
|
|
|
|
->order('g.sort desc,tab_apply.id desc')
|
|
|
|
|
->order('g.sort desc,g.id desc')
|
|
|
|
|
->select();
|
|
|
|
|
$records = [];
|
|
|
|
|
if (!empty($data)) {
|
|
|
|
@ -2813,7 +2813,9 @@ class DownloadController extends BaseController {
|
|
|
|
|
$subMap['create_time'] = ['between', [$map['begintime'], $map['endtime'] - 1]];
|
|
|
|
|
$roleIdMap = $subMap;
|
|
|
|
|
$roleIds = M('user_play_data_count', 'tab_')->where($roleIdMap)->group('role_id')->getField('role_id', true);
|
|
|
|
|
$map['role_id'] = ['in', $roleIds];
|
|
|
|
|
if (count($roleIds) > 0) {
|
|
|
|
|
$map['role_id'] = ['in', $roleIds];
|
|
|
|
|
}
|
|
|
|
|
if ($costBegin != '' || $costEnd != '') {
|
|
|
|
|
$having = '';
|
|
|
|
|
if ($costBegin != '' && $costEnd != '') {
|
|
|
|
|