From 6e016f67e74e08e833ed0de20e347498f8bf94f6 Mon Sep 17 00:00:00 2001
From: sunke <18850253506@163.com>
Date: Fri, 10 Apr 2020 18:24:37 +0800
Subject: [PATCH] ios
---
.../Controller/DownloadController.class.php | 50 ++++++++------
.../Home/Controller/QueryController.class.php | 13 +++-
.../View/default/Query/iosDownLoadDetail.html | 65 ++++++++++++++++---
3 files changed, 95 insertions(+), 33 deletions(-)
diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php
index a7ccef0bf..4de5d7370 100644
--- a/Application/Home/Controller/DownloadController.class.php
+++ b/Application/Home/Controller/DownloadController.class.php
@@ -206,19 +206,15 @@ class DownloadController extends BaseController {
$map['type'] = $type;
}
- if ($createTime != '') {
- $createTimeRow = explode(' 至 ', $createTime);
- $createTimeBegin = 0;
- $createTimeEnd = 0;
- if (count($createTimeRow) == 2) {
- $createTimeBegin = strtotime($createTimeRow[0] . ' 00:00:00');
- $createTimeEnd = strtotime($createTimeRow[1] . ' 23:59:59');
- } else {
- $createTimeBegin = strtotime($createTimeRow[0] . ' 00:00:00');
- $createTimeEnd = strtotime($createTimeRow[0] . ' 23:59:59');
- }
- $map['create_time'] = ['between', [$createTimeBegin, $createTimeEnd]];
- }
+ $nowTime = date('Y-m-d');
+ $initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime)));
+ $initBegTime = empty(I('begtime')) ? $initBegTime : I('begtime');
+ $initEndTime = $nowTime;
+ $initEndTime = empty(I('endtime')) ? $initEndTime : I('endtime');
+ $begTime = strtotime($initBegTime);
+ $endTime = strtotime($initEndTime);
+ $endTime += 3600 * 24;
+ $map['create_time'] = ['between', [$begTime, $endTime]];
$conditions = json_encode($map,TRUE);
$addtime = time();
$data = [
@@ -248,6 +244,7 @@ class DownloadController extends BaseController {
public function ios_data_export() {
$levelPromote = $this->getLevelPromote();
$queryPromote = $this->getQueryPromote($levelPromote);
+ $localId = $queryPromote['id'];
$map = [];
if ($queryPromote['level'] == 4) {
$map['id'] = $queryPromote['id'];
@@ -265,6 +262,9 @@ class DownloadController extends BaseController {
$endTime += 3600 * 24;
$map['create_time'] = ['between', [$begTime, $endTime]];
$map['pid'] = PID;
+ if ($localId !== PID) {
+ $map['localId'] = $localId;
+ }
$conditions = json_encode($map,TRUE);
$addtime = time();
$data = [
@@ -2248,9 +2248,9 @@ public function iosDetailExcelInfo($id,$map) {
}
if (!empty($map['create_time'])) {
$map1['create_time'] = $map['create_time'];
- $tfMap['create_time'] = $map['craete_time'];
- $superMap['create_time'] = $map['craete_time'];
- $companyMap['create_time'] = $map['craete_time'];
+ $tfMap['create_time'] = $map['create_time'];
+ $superMap['create_time'] = $map['create_time'];
+ $companyMap['create_time'] = $map['create_time'];
}
$belongs_president = '';
@@ -2267,8 +2267,10 @@ public function iosDetailExcelInfo($id,$map) {
}
if (!empty($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();
+
$tfMap['promote_id'] = $promote_id;
$tfMap['type'] = 2;
$TFCounts = M('package_download_log', 'tab_')->where($tfMap)->count();
@@ -2366,12 +2368,15 @@ public function iosDetailExcelInfo($id,$map) {
}
if (!empty($map['id'])) {
$map1['id'] = $map['id'];
- $tfMap['create_time'] = $map['craete_time'];
- $superMap['create_time'] = $map['craete_time'];
- $companyMap['create_time'] = $map['craete_time'];
+ $tfMap['create_time'] = $map['create_time'];
+ $superMap['create_time'] = $map['create_time'];
+ $companyMap['create_time'] = $map['create_time'];
}
$rs = M('promote', 'tab_')->field(['id'])->where($map1)->select();
$allids = array_column($rs, 'id');
+ if (!empty($map['localId'])) {
+ array_push($allids, $map['localId']);
+ }
array_push($allids, PID);
$allUserMap['promote_id'] = ['in', $allids];
$allUserMap['device_type'] = 2;
@@ -2409,7 +2414,12 @@ public function iosDetailExcelInfo($id,$map) {
->limit(($i-1)*$perSize ,$perSize)->select();
$ids = array_column($data, 'id');
if ($i == 1) {
+ if (!empty($map['localId'])) {
+ array_unshift($ids,$map['localId'] );
+ }
+
array_unshift($ids, PID);
+
}
foreach($ids as $key => $id) {
$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) {
$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_group'] = "无所属组长";
}
diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index 3998fc6ec..c9af3aa6f 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@@ -2496,12 +2496,13 @@ class QueryController extends BaseController
$row = intval(I('get.row', 10));
$levelPromote = $this->getLevelPromote();
$queryPromote = $this->getQueryPromote($levelPromote);
+ $localId = $queryPromote['id'];
$loginPromote = $this->getLoginPromote();
$map = [];
if ($queryPromote['level'] == 4) {
$map['id'] = $queryPromote['id'];
}else {
- $map['chain'] = ['like', $queryPromote['chain'] . $queryPromote['id'] . '/%'];
+ $map['chain'] = ['like', $queryPromote['chain'] . $queryPromote['id'] . '%'];
}
$iostime = time();
$sunday = strtotime('-1 sunday', $iostime) + 24 * 3600;
@@ -2523,9 +2524,13 @@ class QueryController extends BaseController
$companyMap['create_time'] = ['between', [$begTime, $endTime]];
$superMap['create_time'] = ['between', [$begTime, $endTime]];
+ //var_dump($map);die();
$query = M('promote', 'tab_')->field(['id'])->where($map);
list($promotes, $pagination, $count) = $this->paginate($query);
$ids = array_column($promotes, 'id');
+ if ($localId !== PID) {
+ array_push($ids, $localId);
+ }
if ($page == 1) {
array_push($ids, PID);
}
@@ -2598,7 +2603,7 @@ class QueryController extends BaseController
}
if ($promote['level'] == 2) {
$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_group'] = "无所属组长";
}
@@ -2644,7 +2649,7 @@ class QueryController extends BaseController
$belongs_president = $_REQUEST['belongs_president'];
$belongs_department = $_REQUEST['belongs_department'];
$belongs_group = $_REQUEST['belongs_group'];
- $createTime = I('create_time', '');
+ // $createTime = I('create_time', '');
$nowTime = date('Y-m-d');
$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('pagination', $pagination);
$this->assign('datas', $packAges);
+ $this->assign('initBegTime', $initBegTime);
+ $this->assign('initEndTime', $initEndTime);
$this->display();
}
}
diff --git a/Application/Home/View/default/Query/iosDownLoadDetail.html b/Application/Home/View/default/Query/iosDownLoadDetail.html
index d08732ed3..6edef88ca 100644
--- a/Application/Home/View/default/Query/iosDownLoadDetail.html
+++ b/Application/Home/View/default/Query/iosDownLoadDetail.html
@@ -35,9 +35,19 @@
-