diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 2a87bac71..4156ab513 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -6940,8 +6940,11 @@ class ExportController extends Controller } if (!empty(I('timeend'))) { - $timeend = strtotime(I('timeend')); - $map['_string'] .= " and s.pay_time < {$timeend}"; + $timeend = strtotime(I('timeend') . ' 23:59:59'); + if (!empty($map['_string'])) { + $map['_string'] .= " and "; + } + $map['_string'] .= " s.pay_time < {$timeend}"; } $xlsData = D("spend")->gameStatistics($map); @@ -7006,8 +7009,11 @@ class ExportController extends Controller } if (!empty(I('timeend'))) { - $timeend = strtotime(I('timeend')); - $map['_string'] .= " and pay_time < {$timeend}"; + $timeend = strtotime(I('timeend') . ' 23:59:59'); + if (!empty($map['_string'])) { + $map['_string'] .= " and "; + } + $map['_string'] .= " pay_time < {$timeend}"; } $map['pay_status'] = 1;