elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ios

Browse Source
master
sunke 5 years ago
parent 3423aff9dc
commit 6e016f67e7
3 changed files with 95 additions and 33 deletions
Show Stats Download Patch File Download Diff File

50
Application/Home/Controller/DownloadController.class.php
Unescape Escape View File

@ -206,19 +206,15 @@ class DownloadController extends BaseController {
$map['type'] = $type; $map['type'] = $type;
} }
if ($createTime != '') { $nowTime = date('Y-m-d');
$createTimeRow = explode(' 至 ', $createTime); $initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime)));
$createTimeBegin = 0; $initBegTime = empty(I('begtime')) ? $initBegTime : I('begtime');
$createTimeEnd = 0; $initEndTime = $nowTime;
if (count($createTimeRow) == 2) { $initEndTime = empty(I('endtime')) ? $initEndTime : I('endtime');
$createTimeBegin = strtotime($createTimeRow[0] . ' 00:00:00'); $begTime = strtotime($initBegTime);
$createTimeEnd = strtotime($createTimeRow[1] . ' 23:59:59'); $endTime = strtotime($initEndTime);
} else { $endTime += 3600 * 24;
$createTimeBegin = strtotime($createTimeRow[0] . ' 00:00:00'); $map['create_time'] = ['between', [$begTime, $endTime]];
$createTimeEnd = strtotime($createTimeRow[0] . ' 23:59:59');
}
$map['create_time'] = ['between', [$createTimeBegin, $createTimeEnd]];
}
$conditions = json_encode($map,TRUE); $conditions = json_encode($map,TRUE);
$addtime = time(); $addtime = time();
$data = [ $data = [
@ -248,6 +244,7 @@ class DownloadController extends BaseController {
public function ios_data_export() { public function ios_data_export() {
$levelPromote = $this->getLevelPromote(); $levelPromote = $this->getLevelPromote();
$queryPromote = $this->getQueryPromote($levelPromote); $queryPromote = $this->getQueryPromote($levelPromote);
$localId = $queryPromote['id'];
$map = []; $map = [];
if ($queryPromote['level'] == 4) { if ($queryPromote['level'] == 4) {
$map['id'] = $queryPromote['id']; $map['id'] = $queryPromote['id'];
@ -265,6 +262,9 @@ class DownloadController extends BaseController {
$endTime += 3600 * 24; $endTime += 3600 * 24;
$map['create_time'] = ['between', [$begTime, $endTime]]; $map['create_time'] = ['between', [$begTime, $endTime]];
$map['pid'] = PID; $map['pid'] = PID;
if ($localId !== PID) {
$map['localId'] = $localId;
}
$conditions = json_encode($map,TRUE); $conditions = json_encode($map,TRUE);
$addtime = time(); $addtime = time();
$data = [ $data = [
@ -2248,9 +2248,9 @@ public function iosDetailExcelInfo($id,$map) {
} }
if (!empty($map['create_time'])) { if (!empty($map['create_time'])) {
$map1['create_time'] = $map['create_time']; $map1['create_time'] = $map['create_time'];
$tfMap['create_time'] = $map['craete_time']; $tfMap['create_time'] = $map['create_time'];
$superMap['create_time'] = $map['craete_time']; $superMap['create_time'] = $map['create_time'];
$companyMap['create_time'] = $map['craete_time']; $companyMap['create_time'] = $map['create_time'];
} }
$belongs_president = ''; $belongs_president = '';
@ -2267,8 +2267,10 @@ public function iosDetailExcelInfo($id,$map) {
} }
if (!empty($map['promote_id'])) { if (!empty($map['promote_id'])) {
$promote_id = $map['promote_id']; $promote_id = $map['promote_id'];
$map1['promote_id'] = $map['promote_id'];
} }
$rs = M('package_download_log', 'tab_')->field('id,game_id,user_id,type,create_time')->where($map1)->select(); $rs = M('package_download_log', 'tab_')->field('id,game_id,user_id,type,create_time')->where($map1)->select();
$tfMap['promote_id'] = $promote_id; $tfMap['promote_id'] = $promote_id;
$tfMap['type'] = 2; $tfMap['type'] = 2;
$TFCounts = M('package_download_log', 'tab_')->where($tfMap)->count(); $TFCounts = M('package_download_log', 'tab_')->where($tfMap)->count();
@ -2366,12 +2368,15 @@ public function iosDetailExcelInfo($id,$map) {
} }
if (!empty($map['id'])) { if (!empty($map['id'])) {
$map1['id'] = $map['id']; $map1['id'] = $map['id'];
$tfMap['create_time'] = $map['craete_time']; $tfMap['create_time'] = $map['create_time'];
$superMap['create_time'] = $map['craete_time']; $superMap['create_time'] = $map['create_time'];
$companyMap['create_time'] = $map['craete_time']; $companyMap['create_time'] = $map['create_time'];
} }
$rs = M('promote', 'tab_')->field(['id'])->where($map1)->select(); $rs = M('promote', 'tab_')->field(['id'])->where($map1)->select();
$allids = array_column($rs, 'id'); $allids = array_column($rs, 'id');
if (!empty($map['localId'])) {
array_push($allids, $map['localId']);
}
array_push($allids, PID); array_push($allids, PID);
$allUserMap['promote_id'] = ['in', $allids]; $allUserMap['promote_id'] = ['in', $allids];
$allUserMap['device_type'] = 2; $allUserMap['device_type'] = 2;
@ -2409,7 +2414,12 @@ public function iosDetailExcelInfo($id,$map) {
->limit(($i-1)*$perSize ,$perSize)->select(); ->limit(($i-1)*$perSize ,$perSize)->select();
$ids = array_column($data, 'id'); $ids = array_column($data, 'id');
if ($i == 1) { if ($i == 1) {
if (!empty($map['localId'])) {
array_unshift($ids,$map['localId'] );
}
array_unshift($ids, PID); array_unshift($ids, PID);
} }
foreach($ids as $key => $id) { foreach($ids as $key => $id) {
$promote1 = M('promote', 'tab_')->field('account, level, parent_id, chain')->where(['id' => $id])->select(); $promote1 = M('promote', 'tab_')->field('account, level, parent_id, chain')->where(['id' => $id])->select();
@ -2451,7 +2461,7 @@ public function iosDetailExcelInfo($id,$map) {
} }
if ($promote['level'] == 2) { if ($promote['level'] == 2) {
$parentPromote = M('promote', 'tab_')->field('account')->where(['id'=>$promote['parent_id']])->select(); $parentPromote = M('promote', 'tab_')->field('account')->where(['id'=>$promote['parent_id']])->select();
$csvData['belongs_president'] = $parentPromote['account']; $csvData['belongs_president'] = $parentPromote[0]['account'];
$csvData['belongs_department'] = $promote['account']; $csvData['belongs_department'] = $promote['account'];
$csvData['belongs_group'] = "无所属组长"; $csvData['belongs_group'] = "无所属组长";
} }

13
Application/Home/Controller/QueryController.class.php
Unescape Escape View File

@ -2496,12 +2496,13 @@ class QueryController extends BaseController
$row = intval(I('get.row', 10)); $row = intval(I('get.row', 10));
$levelPromote = $this->getLevelPromote(); $levelPromote = $this->getLevelPromote();
$queryPromote = $this->getQueryPromote($levelPromote); $queryPromote = $this->getQueryPromote($levelPromote);
$localId = $queryPromote['id'];
$loginPromote = $this->getLoginPromote(); $loginPromote = $this->getLoginPromote();
$map = []; $map = [];
if ($queryPromote['level'] == 4) { if ($queryPromote['level'] == 4) {
$map['id'] = $queryPromote['id']; $map['id'] = $queryPromote['id'];
}else { }else {
$map['chain'] = ['like', $queryPromote['chain'] . $queryPromote['id'] . '/%']; $map['chain'] = ['like', $queryPromote['chain'] . $queryPromote['id'] . '%'];
} }
$iostime = time(); $iostime = time();
$sunday = strtotime('-1 sunday', $iostime) + 24 * 3600; $sunday = strtotime('-1 sunday', $iostime) + 24 * 3600;
@ -2523,9 +2524,13 @@ class QueryController extends BaseController
$companyMap['create_time'] = ['between', [$begTime, $endTime]]; $companyMap['create_time'] = ['between', [$begTime, $endTime]];
$superMap['create_time'] = ['between', [$begTime, $endTime]]; $superMap['create_time'] = ['between', [$begTime, $endTime]];
//var_dump($map);die();
$query = M('promote', 'tab_')->field(['id'])->where($map); $query = M('promote', 'tab_')->field(['id'])->where($map);
list($promotes, $pagination, $count) = $this->paginate($query); list($promotes, $pagination, $count) = $this->paginate($query);
$ids = array_column($promotes, 'id'); $ids = array_column($promotes, 'id');
if ($localId !== PID) {
array_push($ids, $localId);
}
if ($page == 1) { if ($page == 1) {
array_push($ids, PID); array_push($ids, PID);
} }
@ -2598,7 +2603,7 @@ class QueryController extends BaseController
} }
if ($promote['level'] == 2) { if ($promote['level'] == 2) {
$parentPromote = M('promote', 'tab_')->field('account')->where(['id'=>$promote['parent_id']])->select(); $parentPromote = M('promote', 'tab_')->field('account')->where(['id'=>$promote['parent_id']])->select();
$listData[$key]['belongs_president'] = $parentPromote['account']; $listData[$key]['belongs_president'] = $parentPromote[0]['account'];
$listData[$key]['belongs_department'] = $promote['account']; $listData[$key]['belongs_department'] = $promote['account'];
$listData[$key]['belongs_group'] = "无所属组长"; $listData[$key]['belongs_group'] = "无所属组长";
} }
@ -2644,7 +2649,7 @@ class QueryController extends BaseController
$belongs_president = $_REQUEST['belongs_president']; $belongs_president = $_REQUEST['belongs_president'];
$belongs_department = $_REQUEST['belongs_department']; $belongs_department = $_REQUEST['belongs_department'];
$belongs_group = $_REQUEST['belongs_group']; $belongs_group = $_REQUEST['belongs_group'];
$createTime = I('create_time', ''); // $createTime = I('create_time', '');
$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)));
@ -2717,6 +2722,8 @@ class QueryController extends BaseController
$this->assign('belongs_group', $belongs_group); $this->assign('belongs_group', $belongs_group);
$this->assign('pagination', $pagination); $this->assign('pagination', $pagination);
$this->assign('datas', $packAges); $this->assign('datas', $packAges);
$this->assign('initBegTime', $initBegTime);
$this->assign('initEndTime', $initEndTime);
$this->display(); $this->display();
} }
} }

65
Application/Home/View/default/Query/iosDownLoadDetail.html
Unescape Escape View File

@ -35,9 +35,19 @@
<option value="3" <if condition="I('type') === '3'">selected</if>>超级签下载</option> <option value="3" <if condition="I('type') === '3'">selected</if>>超级签下载</option>
</select> </select>
</div> </div>
<div class="form-group normal_space fr"> <!-- <div class="form-group normal_space fr">
<label>创建时间：</label> <label>创建时间：</label>
<input type="text" class="txt range-date" name="create_time" placeholder="创建时间" value="{:I('create_time')}" > <input type="text" class="txt range-date" name="create_time" placeholder="创建时间" value="{:I('create_time')}" >
</div> -->
<div class="form-group normal_space fr" style="display: flex;">
<label class="form-title select-title" style="position: relative;">创建时间：</label>
<div class="select-time">
<input type="text" readonly id="sdate" class="txt" name="begtime" placeholder="开始时间" value="{$initBegTime}">
</div>
<label class="form-title select-title zhi_color">&nbsp;—&nbsp;</label>
<div class="select-time">
<input type="text" readonly id="edate" class="txt" name="endtime" placeholder="结束时间" value="{$initEndTime}">
</div>
</div> </div>
<div class="form-group normal_space"> <div class="form-group normal_space">
<input type="submit" class="submit" id='submit' url="{:U('Query/iosDownLoadDetail',['promote_id'=>$promote_id,'belongs_president'=>$belongs_president, 'belongs_department'=>$belongs_department, 'belongs_group'=>$belongs_group])}" <input type="submit" class="submit" id='submit' url="{:U('Query/iosDownLoadDetail',['promote_id'=>$promote_id,'belongs_president'=>$belongs_president, 'belongs_department'=>$belongs_department, 'belongs_group'=>$belongs_group])}"
@ -79,7 +89,7 @@
</div> </div>
<div class="pagenation clearfix"> <div class="pagenation clearfix">
<?php if ($loginer['level'] !== 4) :?> <?php if ($loginer['level'] !== 4) :?>
<a id="sch-btn" data-href="{:U('download/iosdetail_data_export',array_merge(['xlsname'=>'ceshi'],I('get.')))}" class="ajax-get">导出</a> <a id="sch-btn" data-href="{:U('download/iosdetail_data_export',array_merge(['xlsname'=>'ceshi','begtime'=>$initBegTime,'endtime'=>$initEndTime],I('get.')))}" class="ajax-get">导出</a>
<?php endif ;?> <?php endif ;?>
{$pagination} {$pagination}
</div> </div>
@ -95,22 +105,57 @@
</block> </block>
<block name="script"> <block name="script">
<link rel="stylesheet" href="__STATIC__/flatpickr/flatpickr.min.css"> <link rel="stylesheet" href="__STATIC__/flatpickr/flatpickr.min.css">
<link href="__STATIC__/datetimepicker/css/datetimepicker.css" rel="stylesheet" type="text/css">
<link href="__STATIC__/datetimepicker/css/dropdown.css" rel="stylesheet" type="text/css">
<script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
<script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js"
charset="UTF-8"></script>
<script src="__STATIC__/flatpickr/flatpickr.min.js"></script> <script src="__STATIC__/flatpickr/flatpickr.min.js"></script>
<script src="__STATIC__/flatpickr/l10n/zh.js"></script> <script src="__STATIC__/flatpickr/l10n/zh.js"></script>
<script type="text/javascript" src="__JS__/20170831/select2.min.js"></script> <script type="text/javascript" src="__JS__/20170831/select2.min.js"></script>
<script type="text/javascript" src="__JS__/common.js"></script> <script type="text/javascript" src="__JS__/common.js"></script>
<script>
setValue('row', '{:I("get.row",10)}');
$(".select_gallery").select2();
var date = "{$setdate}";
console.log(date);
$('#sdate').datetimepicker({
format: 'yyyy-mm-dd',
language: "zh-CN",
minView: 2,
autoclose: true,
scrollMonth: false,
scrollTime: false,
scrollInput: false,
endDate: date
});
$('#edate').datetimepicker({
format: 'yyyy-mm-dd',
language: "zh-CN",
minView: 2,
autoclose: true,
pickerPosition: 'bottom-left',
scrollMonth: false,
scrollTime: false,
scrollInput: false,
endDate: date
});
</script>
<script type="text/javascript"> <script type="text/javascript">
$(function() { $(function() {
setValue('row', '{:I("get.row",10)}'); setValue('row', '{:I("get.row",10)}');
var defaultDate = $('.range-date').val() // var defaultDate = $('.range-date').val()
defaultDate = defaultDate == '' ? [] : defaultDate.split(' 至 ') // defaultDate = defaultDate == '' ? [] : defaultDate.split(' 至 ')
$('.range-date').flatpickr({ // $('.range-date').flatpickr({
mode: 'range', // mode: 'range',
locale: 'zh', // locale: 'zh',
dateFormat: "Y-m-d", // dateFormat: "Y-m-d",
defaultDate: defaultDate, // defaultDate: defaultDate,
}) // })
$('.select_gallery').select2() $('.select_gallery').select2()
var gameId = $('#game-select').val(); var gameId = $('#game-select').val();
var sdkVersion = $('#sdk_version').val(); var sdkVersion = $('#sdk_version').val();

Write Preview
Loading…
Cancel
Save