时间搜索

application/index/controller/Transfer.php

@@ -46,14 +46,18 @@ class Transfer extends Basic
 
         $where = array();
 
-        if (!empty($params['start_date'])) {
+        if (!empty($params['start_date']) && empty($params['end_date'])) {
             $where['create_time'] = ['> time', $params['start_date']];
         }
 
-        if (!empty($params['end_date'])) {
+        if (!empty($params['end_date']) && empty($params['start_date'])) {
             $where['create_time'] = ['< time', $params['end_date']];
         }
 
+        if (!empty($params['start_date']) && !empty($params['end_date'])) {
+            $where['create_time'] = ['between time', [$params['start_date'],$params['end_date']]];
+        }
+
         if (!empty($params['name'])) {
             $where['appellation'] = ['like', $params['name'].'%'];
         }
@@ -71,6 +75,7 @@ class Transfer extends Basic
         $fields = 'id,shop_name,manage_type,address_detail,province,city,district,expected_rent,appellation,tel,create_time,status';
 
         $data['list'] = $sublet->getSublet($pageNo, $pageSize, 'id desc', $fields, $where);
+
         $data['total'] = $sublet->getSubletTotal($where);
         return $this->response($data['status'], $data['msg'], $data);
     }
@@ -89,10 +94,17 @@ class Transfer extends Basic
         $sublet = new SubletModel();
         $sublet_data = $sublet->field('id,house_id')->where('id',$params['id'])->find();
 
-        if ($sublet) {
+        if ($sublet_data['id']) {
+
+            if ($sublet_data['house_id']) {
+                $status = 2;
+            } else {
+                /***客户自己填写的转铺信息，在B端后台发布商铺更改为2***/
+                $status = 1;
+            }
             $sublet->update([
                 'id'     => $sublet_data['id'],
-                'status' => $params['status']
+                'status' => $status
             ]);
 
             $house = Db::table('houseinfos')->field('id,room_num_left')->where('id', $sublet_data['house_id'])->find();

application/index/controller/WatchShop.php

@@ -34,14 +34,18 @@ class WatchShop extends Basic
 
         $where = array();
 
-        if (!empty($params['start_date'])) {
+        if (!empty($params['start_date']) && empty($params['end_date'])) {
             $where['create_time'] = ['> time', $params['start_date']];
         }
 
-        if (!empty($params['end_date'])) {
+        if (!empty($params['end_date']) && empty($params['start_date'])) {
             $where['create_time'] = ['< time', $params['end_date']];
         }
 
+        if (!empty($params['start_date']) && !empty($params['end_date'])) {
+            $where['create_time'] = ['between time', [$params['start_date'],$params['end_date']]];
+        }
+
         if (!empty($params['name'])) {
             $where['appellation'] = ['like', $params['name'].'%'];
         }