查询功能

app/adminapi/controller/asset/AssetLeaseController.php

@@ -20,6 +20,7 @@ use app\adminapi\lists\asset\AssetLeaseLists;
 use app\adminapi\logic\notice\NoticeLogic;
 use app\adminapi\validate\article\ArticleValidate;
 use app\adminapi\validate\asset\AssetValidate;
+use app\common\enum\asset\AssetEnum;
 use app\adminapi\validate\asset\AssetLeaseValidate;
 use app\adminapi\validate\notice\NoticeValidate;
 use app\common\logic\PaymentLogic;
@@ -103,4 +104,9 @@ class AssetLeaseController extends BaseAdminController
         $result = AssetLists::getRentAssetList($params);
         return $this->success('查询成功', $result, 1, 1);
     }
+
+    public function getApprovalSattusDesc(){
+        $list = AssetEnum::APPROVAL_STATUS_SCENE;
+        return $this->success('查询成功',$list, 1, 1);
+    }
 }

app/adminapi/lists/asset/AssetLeaseLists.php

@@ -38,7 +38,8 @@ class AssetLeaseLists extends BaseAdminDataLists implements ListsSearchInterface
     public function setSearch(): array
     {
         return [
-            '=' => ['name', 'status']
+            '=' => [ 'approval_status'],
+            '%like%'=>['tenant_name','tenant_mobile'],
         ];
     }
 
@@ -53,30 +54,31 @@ class AssetLeaseLists extends BaseAdminDataLists implements ListsSearchInterface
      */
     public function lists(): array
     {
-
+        var_dump($this->adminInfo);die;
         $parms =  $this->request->get();
         $where = [] ;
         if(!empty($parms))
         {
-            if(isset($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['tenant_name'])){
-                if(!empty($parms['tenant_name'])){
-                    $where[] = ['tenant_name', 'like', '%' . $parms['tenant_name']. '%'];
+            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['tenant_mobile'])){
-                if(!empty($parms['tenant_mobile'])){
-                    $where[] = ['tenant_mobile', 'like', '%' . $parms['tenant_mobile']. '%'];
+            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']];
+                    }
                 }
             }
+
         }
 
         $lists = (new AssetLeaseInfo())->field('*')
@@ -84,7 +86,7 @@ class AssetLeaseLists extends BaseAdminDataLists implements ListsSearchInterface
             ->with('asset')
             ->with('referee')
             ->where($where)
-//            ->where($this->searchWhere)
+            ->where($this->searchWhere)
             ->limit($this->limitOffset, $this->limitLength)
             ->Order('id desc')
             ->select()

app/common/enum/asset/AssetEnum.php

@@ -82,11 +82,11 @@ class AssetEnum
     * 显示状态场景 second_status
     */
     const APPROVAL_STATUS_SCENE = [
-        self::approval_status_first,
-        self::approval_status_unfirst,
-        self::approval_status_second,
-        self::approval_status_seconded,
-        self::approval_status_unsecond,
+        ['id'=> self::approval_status_first,'status_desc'=>'等待初审'],
+        ['id'=> self::approval_status_unfirst,'status_desc'=>'初审驳回'],
+        ['id'=> self::approval_status_second,'status_desc'=>'等待终审'],
+        ['id'=> self::approval_status_seconded,'status_desc'=>'终审通过'],
+        ['id'=> self::approval_status_unsecond,'status_desc'=>'终审驳回']
     ];
     /**
      * @notes 获取审状态描述
@@ -99,7 +99,7 @@ class AssetEnum
     public static function getApprovalStatusDesc($sceneId, $flag = false)
     {
         $desc = [
-            self::approval_status_first => '等待初审2',
+            self::approval_status_first => '等待初审',
             self::approval_status_unfirst => '初审驳回',
             self::approval_status_second => '等待终审',
             self::approval_status_seconded => '终审通过',