|
|
@ -1481,19 +1481,19 @@ class DownloadController extends BaseController
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!empty(I('begtime')) && empty(I('endtime'))) {
|
|
|
|
if (!empty(I('begtime')) && empty(I('endtime'))) {
|
|
|
|
$map['tab_spend.spend_time'] = ['egt', strtotime(I('begtime'))];
|
|
|
|
$map['tab_spend.spend_time'] = ['egt', strtotime(I('begtime'))];
|
|
|
|
} elseif (empty(I('begtime')) && !empty(I('endtime'))) {
|
|
|
|
} elseif (empty(I('begtime')) && !empty(I('endtime'))) {
|
|
|
|
$map['tab_spend.spend_time'] = ['elt', strtotime(I('endtime')) + 86399];
|
|
|
|
$map['tab_spend.spend_time'] = ['elt', strtotime(I('endtime')) + 86399];
|
|
|
|
} elseif (!empty(I('begtime')) && !empty(I('endtime'))) {
|
|
|
|
} elseif (!empty(I('begtime')) && !empty(I('endtime'))) {
|
|
|
|
$map['tab_spend.spend_time'] = ['between', [strtotime(I('begtime')), strtotime(I('endtime')) + 86399]];
|
|
|
|
$map['tab_spend.spend_time'] = ['between', [strtotime(I('begtime')), strtotime(I('endtime')) + 86399]];
|
|
|
|
}else {
|
|
|
|
}else {
|
|
|
|
$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)));
|
|
|
|
$initEndTime = date('Y-m-d');
|
|
|
|
// $initEndTime = date('Y-m-d');
|
|
|
|
$initBegTime = strtotime($initBegTime);
|
|
|
|
// $initBegTime = strtotime($initBegTime);
|
|
|
|
$initEndTime = strtotime($initEndTime);
|
|
|
|
// $initEndTime = strtotime($initEndTime);
|
|
|
|
$map['tab_spend.spend_time'] = ['between',[$initBegTime,$initEndTime]];
|
|
|
|
// $map['tab_spend.spend_time'] = ['between',[$initBegTime,$initEndTime]];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if ($payedBegTime) {
|
|
|
|
if ($payedBegTime) {
|
|
|
|