From 919791c0c75a46f4ffa9b75091a2986c3c8f23fa Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Thu, 17 Sep 2020 14:32:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=90=8E=E5=8F=B0=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/DownloadController.class.php | 4 +-- .../Home/Controller/QueryController.class.php | 21 ++++++++++++++-- .../Home/View/default/Query/achievement.html | 25 +++++++++++-------- .../Home/View/default/Query/userRoles.html | 12 ++++++--- Public/Home/css/20180207/common.css | 14 +++++++++++ 5 files changed, 58 insertions(+), 18 deletions(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index eeaffe07e..c884d2bb2 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -2907,9 +2907,9 @@ public function iosDetailExcelInfo($id,$map) { foreach ($data as $key1 => $value1) { $value1['user_account'] = $this->encryption($value1['user_account']); if($value1['create_time'] == 0) { - $value1['create_time'] = date('Y-m-d H:i:s', $value['play_time']); + $value1['create_time'] = date('Y-m-d H:i:s', $value1['play_time']); } else { - $value1['create_time'] = date('Y-m-d H:i:s', $value['create_time']); + $value1['create_time'] = date('Y-m-d H:i:s', $value1['create_time']); } if (isset($users[$value1['user_id']])) { $user = $users[$value1['user_id']]; diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 435fbe821..0c3222223 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1687,7 +1687,13 @@ class QueryController extends BaseController $levelPromote = $this->getLevelPromote(); $queryPromote = $this->getQueryPromote($levelPromote); - $map[] = [ + $promoteService = new PromoteService(); + $subInSql = $promoteService->subInSql($queryPromote); + + $map = []; + $map['_string'] = '1=1'; + $map['_string'] .= ' and promote_id in (' . $subInSql . ')'; + /* $map[] = [ '_logic' => 'or', 'id' => $queryPromote['id'], 'chain' => ['like', $queryPromote['chain'] . $queryPromote['id'] . '/%'] @@ -1699,7 +1705,7 @@ class QueryController extends BaseController $map = ['promote_id' => ['in', $ids]]; } else { $map['_string'] = '1<>1'; - } + } */ if ($relationGameId != 0 || $sdkVersion != 0) { $gameIds = gameSearch($relationGameId, $sdkVersion); @@ -1740,6 +1746,13 @@ class QueryController extends BaseController $query = M('user_play_info', 'tab_')->where($map)->order('create_time desc'); list($records, $pagination, $count) = $this->paginate($query); + $countRow = M('user_play_info', 'tab_')->field(['count(distinct user_id) user_count'])->where($map)->find(); + + $countMap = $map; + $subSql = M('user', 'tab_')->field('id')->where(['is_repeat' => 0])->select(false); + $countMap['_string'] .= ' and user_id in (' . $subSql . ')'; + $uniqueCountRow = M('user_play_info', 'tab_')->field(['count(distinct user_id) user_count, count(*) count'])->where($countMap)->find(); + $users = []; if (count($records) > 0) { $userIds = array_column($records, 'user_id'); @@ -1785,6 +1798,10 @@ class QueryController extends BaseController $games = get_promote_serach_game(); + $this->assign('user_count', $countRow['user_count']); + $this->assign('unique_user_count', $uniqueCountRow['user_count']); + $this->assign('unique_count', $uniqueCountRow['count']); + $this->assign('games', $games); $this->assign('records', $records); $this->assign('pagination', $pagination); diff --git a/Application/Home/View/default/Query/achievement.html b/Application/Home/View/default/Query/achievement.html index 460cd03c0..cd632e8b1 100644 --- a/Application/Home/View/default/Query/achievement.html +++ b/Application/Home/View/default/Query/achievement.html @@ -10,6 +10,9 @@ line-height: 34px; height: 34px; } + .pointer-hand { + cursor: pointer; + } @@ -80,19 +83,19 @@ - - - + + + - - + + - - - - - - + + + + + + diff --git a/Application/Home/View/default/Query/userRoles.html b/Application/Home/View/default/Query/userRoles.html index 8941bed1d..6fd9e83ee 100644 --- a/Application/Home/View/default/Query/userRoles.html +++ b/Application/Home/View/default/Query/userRoles.html @@ -114,11 +114,17 @@
- - 导出 - + + 导出 + {$pagination}
+
+
注册数：{$user_count}
+
去重后注册数：{$unique_user_count}
+
创角数：{$count}
+
去重后创角数：{$unique_count}
+
diff --git a/Public/Home/css/20180207/common.css b/Public/Home/css/20180207/common.css index 9c7b86dc1..8c46f1df4 100644 --- a/Public/Home/css/20180207/common.css +++ b/Public/Home/css/20180207/common.css @@ -400,6 +400,20 @@ input,select,button{outline:none;font-size:14px;font-family:inherit;} color: #06C } +.page-list .summary{ + margin-bottom: 10px; +} +.page-list .summary .item { + display: inline-block; + margin-right: 10px; +} +.page-list .summary + .pagenation { + padding-top: 0px; +} +.page-list .summary + .pagenation .rows { + top: 0px; +} + .el-button { display: inline-block; line-height: 1;
账号（姓名）创角数创角用户新创角用户创角数创角用户新创角用户 新创角IP登录用户数新增创角IP登录用户数 充值人数充值次数充值总额现金充值通用币充值绑定币充值充值人数充值次数充值总额现金充值通用币充值绑定币充值 操作