|
|
@@ -39,7 +39,7 @@ class AssetLeaseLists extends BaseAdminDataLists implements ListsSearchInterface
|
|
|
public function setSearch(): array
|
|
|
{
|
|
|
return [
|
|
|
-// '=' => [ ''],
|
|
|
+// '=' => [ 'approval_status'],
|
|
|
'%like%'=>['tenant_name','tenant_mobile'],
|
|
|
];
|
|
|
}
|
|
|
@@ -71,16 +71,21 @@ class AssetLeaseLists extends BaseAdminDataLists implements ListsSearchInterface
|
|
|
$where[] = ['a_id', 'in', $a_id_Arr];
|
|
|
}
|
|
|
}
|
|
|
- if(isset($parms['date_type'])) {
|
|
|
- if (!empty($parms['start_time']) && !empty($parms['end_time'])) {
|
|
|
- if($parms['date_type'] == 1){
|
|
|
- $where[] = ['create_time', 'between', [strtotime($parms['start_time']),strtotime($parms['end_time']. ' 23:59:59')]];
|
|
|
- }else if($parms['date_type'] == 2){
|
|
|
- $where[] = ['lease_start_time', '>=', $parms['start_time']];
|
|
|
- $where[] = ['lease_end_time', '<=', $parms['end_time']];
|
|
|
- }
|
|
|
+ if(isset($parms['name'])) {
|
|
|
+ if (!empty($parms['name'])) {
|
|
|
+ $where[] = ['tenant_name', 'like', '%' . $parms['name'] . '%'];
|
|
|
}
|
|
|
}
|
|
|
+// if(isset($parms['date_type'])) {
|
|
|
+ if (!empty($parms['create_time_start']) && !empty($parms['create_time_end'])) {
|
|
|
+// if($parms['date_type'] == 1){
|
|
|
+ $where[] = ['create_time', 'between', [strtotime($parms['create_time_start']),strtotime($parms['create_time_end']. ' 23:59:59')]];
|
|
|
+// }else if($parms['date_type'] == 2){
|
|
|
+// $where[] = ['lease_start_time', '>=', $parms['start_time']];
|
|
|
+// $where[] = ['lease_end_time', '<=', $parms['end_time']];
|
|
|
+// }
|
|
|
+ }
|
|
|
+// }
|
|
|
if(isset($parms['approval_status'])) {
|
|
|
if ($parms['approval_status']) {
|
|
|
$where[] = ['approval_status', '=', $parms['approval_status']];
|
