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

Merge branch 'hotfix/download'

Browse Source
master
ELF 5 years ago
parent c637a8bfe0 34b53c4ec1
commit 69708490ba
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

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

@ -1639,10 +1639,10 @@ class DownloadController extends BaseController {
$nowTime = date('Y-m-d'); $nowTime = date('Y-m-d');
$begtime1 = date('Y-m-d', strtotime('-6 day', strtotime($nowTime))); $begtime1 = date('Y-m-d', strtotime('-6 day', strtotime($nowTime)));
$endtime1 = $nowTime; $endtime1 = $nowTime;
$map["apply_time"] = ["between",[strtotime($begtime1),strtotime($endtime1)]]; $map["apply_time"] = ["between",[strtotime($begtime1),strtotime($endtime1) + 3600*24]];
} }
if(!empty($begtime) && !empty($endtime)) { if(!empty($begtime) && !empty($endtime)) {
$map["apply_time"] = ["between",[strtotime($begtime),strtotime($endtime) + 3600 * 24 -1]]; $map["apply_time"] = ["between",[strtotime($begtime),strtotime($endtime) + 3600 * 24]];
} }
$serverField = ''; $serverField = '';
$serverJoin = ''; $serverJoin = '';
@ -1841,12 +1841,12 @@ class DownloadController extends BaseController {
$begTime = strtotime($initBegTime); $begTime = strtotime($initBegTime);
$endTime = strtotime($initEndTime); $endTime = strtotime($initEndTime);
$params['begin_time'] = $begTime; $params['begin_time'] = $begTime;
$params['end_time'] = $endTime +3600 * 24 -1; $params['end_time'] = $endTime -1;
if(!empty($map['apply_time'][1])) { if(!empty($map['apply_time'][1])) {
$begTime = $map['apply_time'][1][0]; $begTime = $map['apply_time'][1][0];
$endTime = $map['apply_time'][1][1]; $endTime = $map['apply_time'][1][1];
$params['begin_time'] = $begTime; $params['begin_time'] = $begTime;
$params['end_time'] = $endTime + 3600 * 24 -1; $params['end_time'] = $endTime -1;
unset($map['apply_time']); unset($map['apply_time']);
} }
if(!empty($map['tab_server.server_id'])) { if(!empty($map['tab_server.server_id'])) {

Write Preview
Loading…
Cancel
Save