diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index b1daad232..dac68565b 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -1855,7 +1855,7 @@ class DownloadController extends BaseController { $begTime = strtotime($initBegTime); $endTime = strtotime($initEndTime); $params['begin_time'] = $begTime; - $params['end_time'] = $endTime; + $params['end_time'] = $endTime -1; if(!empty($map['apply_time'][1])) { $begTime = $map['apply_time'][1][0]; $endTime = $map['apply_time'][1][1]; @@ -2560,23 +2560,23 @@ class DownloadController extends BaseController { } public function dailysummaryExcelInfo($id,$map) { - $xlsName = "每日概况"; - $xlsCell = array( + $xlsName = "每日概况"; + $xlsCell = array( array('day','日期'), - array('role_num','创角数'), - array('user_num','创角用户'), + array('role_num','创角数'), + array('user_num','创角用户'), array('new_user_num','新创角用户'), array('new_device_num','新创角设备'), - array('new_ip_num','新增创角IP'), - array('login_user_num','登陆用户数'), - array('spend_user_num','充值人数'), - array('spend_num','充值次数'), - array('spend_all_amount','充值总额'), - array('spend_cash','现金充值'), - array('spend_generic','通用币充值'), - array('spend_binding','绑定币充值'), - array('spend_discount','折扣币充值'), - array('spend_voucher','代金劵使用'), + array('new_ip_num','新增创角IP'), + array('login_user_num','登陆用户数'), + array('spend_user_num','充值人数'), + array('spend_num','充值次数'), + array('spend_all_amount','充值总额'), + array('spend_cash','现金充值'), + array('spend_generic','通用币充值'), + array('spend_binding','绑定币充值'), + array('spend_discount','折扣币充值'), + array('spend_voucher','代金劵使用'), ); $nowTime = date('Y-m-d'); @@ -2603,7 +2603,7 @@ class DownloadController extends BaseController { if(!empty($map['end_time'])) { $params['end_time'] = $map['end_time']; }else { - $params['begin_time'] = $endTime; + $params['begin_time'] = $endTime - 1; } $params['dayList'] = $map["dayList"]; $summaryData = [];