1

app/adminapi/lists/asset/AssetLeaseLists.php

@@ -175,27 +175,29 @@ class AssetLeaseLists extends BaseAdminDataLists implements ListsSearchInterface
 
         $parms =  $this->request->get();
         $where = [] ;
+        $flag = false;
         if(!empty($parms))
         {
-            if(isset($parms['asset_name'])) {
-                if (!empty($parms['asset_name'])) {
+            if(isset($parms['name'])) {
+                if (!empty($parms['name'])) {
                     $awhere = [];
-                    $awhere[] = ['name', 'like', '%' . $parms['asset_name'] . '%'];
+                    $awhere[] = ['name', 'like', '%' . $parms['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['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']];
@@ -206,6 +208,7 @@ class AssetLeaseLists extends BaseAdminDataLists implements ListsSearchInterface
                 $today = date('Y-m-d');
                 $expiration_date = date('Y-m-d', strtotime($today . ' +30 day'));
                 if ($parms['expiration_flag']) {
+                    $flag = true;
                     $where[] = ['lease_end_time', '<=', $expiration_date];
                     $where[] = ['approval_status','=','5'];
                     $where[] = ['is_remind','=','1'];
@@ -289,6 +292,7 @@ class AssetLeaseLists extends BaseAdminDataLists implements ListsSearchInterface
             'referee_uid' =>$params['referee_uid'],
             'approval_status'=>$params['approval_status']??1,
             'remark' => $params['remark'] ?? '',
+            'is_pay' => $params['is_pay'] ?? 0,
             'area_id' => $area_id ?? 0,
         ]);
         if(isset($params['remind_id'])){