1

app/adminapi/controller/asset/AssetLeaseController.php

@@ -107,6 +107,8 @@ class AssetLeaseController extends BaseAdminController
 
     public function getApprovalSattusDesc(){
         $list = AssetEnum::APPROVAL_STATUS_SCENE;
-        return $this->success('查询成功',$list, 1, 1);
+        $lists =[ ['id'=>0,'status_desc'=>'全部']];
+        $lists = array_merge($lists,$list);
+        return $this->success('查询成功',$lists, 1, 1);
     }
 }

app/adminapi/lists/asset/AssetLeaseLists.php

@@ -38,7 +38,7 @@ class AssetLeaseLists extends BaseAdminDataLists implements ListsSearchInterface
     public function setSearch(): array
     {
         return [
-            '=' => [ 'approval_status'],
+//            '=' => [ ''],
             '%like%'=>['tenant_name','tenant_mobile'],
         ];
     }
@@ -54,7 +54,9 @@ class AssetLeaseLists extends BaseAdminDataLists implements ListsSearchInterface
      */
     public function lists(): array
     {
-        var_dump($this->adminInfo);die;
+
+        $admin_info = $this->adminInfo;
+
         $parms =  $this->request->get();
         $where = [] ;
         if(!empty($parms))
@@ -78,9 +80,17 @@ class AssetLeaseLists extends BaseAdminDataLists implements ListsSearchInterface
                     }
                 }
             }
+            if(isset($parms['approval_status'])) {
+                if ($parms['approval_status']) {
+                    $where[] = ['approval_status', '=', $parms['approval_status']];
+                }
+            }
 
         }
 
+        if(!$admin_info['root']){
+//            $where[] = ['lease_start_time', '>=', $parms['start_time']];
+        }
         $lists = (new AssetLeaseInfo())->field('*')
             ->append(['first_status_desc','second_status_desc','approval_status_desc'])
             ->with('asset')
@@ -108,7 +118,37 @@ class AssetLeaseLists extends BaseAdminDataLists implements ListsSearchInterface
      */
     public function count(): int
     {
-        return (new AssetLeaseInfo())->where($this->searchWhere)->count();
+        $parms =  $this->request->get();
+        $where = [] ;
+        if(!empty($parms))
+        {
+            if(isset($parms['asset_name'])) {
+                if (!empty($parms['asset_name'])) {
+                    $awhere = [];
+                    $awhere[] = ['name', 'like', '%' . $parms['asset_name'] . '%'];
+                    $assetList = AssetInfo::where($awhere)->select()->toArray();
+                    $a_id_Arr = array_column($assetList, 'id');
+                    $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['approval_status'])) {
+                if ($parms['approval_status']) {
+                    $where[] = ['approval_status', '=', $parms['approval_status']];
+                }
+            }
+
+        }
+        return (new AssetLeaseInfo())->where($this->searchWhere)->where($where)->count();
     }
 
     /**

app/adminapi/logic/LoginLogic.php

@@ -57,7 +57,7 @@ class LoginLogic extends BaseLogic
             'name' => $adminInfo['name'],
             'avatar' => $avatar,
             'role_name' => $adminInfo['role_name'],
-            'token' => $adminInfo['token'],
+            'token' => $adminInfo['token']
         ];
     }