空闲状态调整

webmain/task/openapi/openmeetAction.php

@@ -27,9 +27,17 @@ class openmeetClassAction extends openapiAction
         }
 
         $sqlStr = /** @lang text */
-            "SELECT 1 as type, id, title, start_time, end_time, null as compere, meet_state  FROM `xinhu_meeting` where start_time REGEXP '".date("Y-m-d")."' and meeting_room = '".$rawData['room_name']."'
+            "SELECT 1 as type, id, title, start_time, end_time, null as compere, meet_state  
+               FROM `[Q]meeting` 
+              where start_time REGEXP '".date("Y-m-d")."'
+                and end_time > now()
+                and meeting_room = '".$rawData['room_name']."'
              union all
-             SELECT 2 as type, id, title, start_time, end_time, compere, meet_state  FROM `xinhu_meeting_key` where start_time REGEXP '".date("Y-m-d")."' and meeting_room = '".$rawData['room_name']."'";
+             SELECT 2 as type, id, title, start_time, end_time, compere, meet_state 
+               FROM `[Q]meeting_key` 
+              where start_time REGEXP '".date("Y-m-d")."' 
+                and end_time > now()
+                and meeting_room = '".$rawData['room_name']."'";
 
         $meetData = $this->db->getall($sqlStr);
 
@@ -84,9 +92,9 @@ class openmeetClassAction extends openapiAction
         }
 
         $nowMeetingSql = /** @lang text */
-            "SELECT 1 as type, id, title, start_time, end_time, null as compere, meet_state, meeting_room  FROM `xinhu_meeting` where start_time < now() and end_time > now() and meeting_room = '".$rawData['room_name']."'
+            "SELECT 1 as type, id, title, start_time, end_time, null as compere, meet_state, meeting_room  FROM `[Q]meeting` where start_time < now() and end_time > now() and meeting_room = '".$rawData['room_name']."'
              union all
-             SELECT 2 as type, id, title, start_time, end_time, compere, meet_state, meeting_room  FROM `xinhu_meeting_key` where start_time < now() and end_time > now() and meeting_room = '".$rawData['room_name']."'";
+             SELECT 2 as type, id, title, start_time, end_time, compere, meet_state, meeting_room  FROM `[Q]meeting_key` where start_time < now() and end_time > now() and meeting_room = '".$rawData['room_name']."'";
         $nowMeetingData = $this->db->getall($nowMeetingSql);