|
|
@@ -89,9 +89,10 @@ class AssetLeaseLists extends BaseAdminDataLists implements ListsSearchInterface
|
|
|
}
|
|
|
|
|
|
if(isset($parms['expiration_flag'])) {
|
|
|
- $expiration_date = date('Y-m-d',strtotime(time() . '+30 day'));//购买过后的到期时间 $size
|
|
|
+ $today = date('Y-m-d');
|
|
|
+ $expiration_date = date('Y-m-d', strtotime($today . ' +30 day'));
|
|
|
if ($parms['expiration_flag']) {
|
|
|
-// $where[] = ['lease_end_time', '<=', $expiration_date];
|
|
|
+ $where[] = ['lease_end_time', '<=', $expiration_date];
|
|
|
$where[] = ['approval_status','=','5'];
|
|
|
}
|
|
|
}
|
|
|
@@ -191,9 +192,10 @@ class AssetLeaseLists extends BaseAdminDataLists implements ListsSearchInterface
|
|
|
}
|
|
|
|
|
|
if(isset($parms['expiration_flag'])) {
|
|
|
- $expiration_date = date('Y-m-d',strtotime(time() . '+30 day'));//购买过后的到期时间 $size
|
|
|
+ $today = date('Y-m-d');
|
|
|
+ $expiration_date = date('Y-m-d', strtotime($today . ' +30 day'));
|
|
|
if ($parms['expiration_flag']) {
|
|
|
-// $where[] = ['lease_end_time', '<=', $expiration_date];
|
|
|
+ $where[] = ['lease_end_time', '<=', $expiration_date];
|
|
|
$where[] = ['approval_status','=','5'];
|
|
|
}
|
|
|
}
|