|
|
|
@ -582,11 +582,11 @@ class FinancePromoteController extends AdminController
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (isset($_REQUEST['time_start']) && isset($_REQUEST['time_end'])) {
|
|
|
|
|
$map['s.pay_time'] = ['between', [strtotime($_REQUEST['time_start']), strtotime($_REQUEST['time_end']) + 86399]];
|
|
|
|
|
$map['s.payed_time'] = ['between', [strtotime($_REQUEST['time_start']), strtotime($_REQUEST['time_end']) + 86399]];
|
|
|
|
|
} elseif (isset($_REQUEST['time_start'])) {
|
|
|
|
|
$map['s.pay_time'] = ['GT', strtotime($_REQUEST['time_start'])];
|
|
|
|
|
$map['s.payed_time'] = ['GT', strtotime($_REQUEST['time_start'])];
|
|
|
|
|
} elseif (isset($_REQUEST['time_end'])) {
|
|
|
|
|
$map['s.pay_time'] = ['LT', strtotime($_REQUEST['time_end']) + 86399];
|
|
|
|
|
$map['s.payed_time'] = ['LT', strtotime($_REQUEST['time_end']) + 86399];
|
|
|
|
|
}
|
|
|
|
|
if (!empty(I('develop_type'))) {
|
|
|
|
|
// $map['develop_type'] = I('develop_type');
|
|
|
|
|