会议APP接口调整

webmain/task/openapi/openmeetAction.php

@@ -218,12 +218,14 @@ class openmeetClassAction extends openapiAction
                     SELECT 1 FROM `[Q]meeting`
                      WHERE `status` = 1
                        and `start_time` < now()
+                       and `end_time` > now()
                        and `start_time` REGEXP '".$dataDate."'
                        and `meet_state` != 2
                        and `room_id` = '".$data['id']."'
                     UNION ALL
                     SELECT 1 FROM `[Q]meeting_key`
                      WHERE `start_time` < now()
+                       and `end_time` > now()
                        and `start_time` REGEXP '".$dataDate."'
                        and `meet_state` != 2
                        and `room_id` = '".$data['id']."'
@@ -234,12 +236,14 @@ class openmeetClassAction extends openapiAction
                 "SELECT count(1) con FROM (
                     SELECT 1 FROM `[Q]meeting`
                      WHERE `status` = 1
-                       AND `meet_state` != 2
                        AND `start_time` REGEXP '".$dataDate."'
+                       AND `end_time` > now()
+                       AND `meet_state` != 2
                        AND `room_id` = '".$data['id']."'
                     UNION ALL
                     SELECT 1 FROM `[Q]meeting_key`
                      WHERE `start_time` REGEXP '".$dataDate."'
+                       AND `end_time` > now()
                        AND `meet_state` != 2
                        AND `room_id` = '".$data['id']."'
                 ) t";
@@ -249,8 +253,8 @@ class openmeetClassAction extends openapiAction
                 'meeting_room_id' => $data['id'],
                 'meeting_room_name' => $data['room_name'],
                 'meeting_room_text' => $data['desc'],
-                'meeting_room_state' => $meetingHave[0]['con'] ?? 0 > 0 ? 1 : 0,
-                'meeting_room_state_text' => $meetingHave[0]['con']  ?? 0 > 0 ? "会议中" : "空闲中",
+                'meeting_room_state' => $meetingHave[0]['con'] > 0 ? 1 : 0,
+                'meeting_room_state_text' => $meetingHave[0]['con'] > 0 ? "会议中" : "空闲中",
                 'meeting_today_num' => $meetCon[0]['con'] ?? 0
             ];
         }
@@ -285,12 +289,14 @@ class openmeetClassAction extends openapiAction
               WHERE `status` = 1
                 and `start_time` regexp '".$dataDate."'
                 and `meet_state` != 2
+                and `end_time` > now()
                 and `room_id` = '".$roomId."'
              UNION ALL
              SELECT 2 as type, id, title, start_time, end_time, compere, '党委会议' as meeting_type 
                FROM `[Q]meeting_key`
               WHERE `start_time` regexp '".$dataDate."'
                 and `meet_state` != 2
+                and `end_time` > now()
                 and `room_id` = '".$roomId."'
             ";
         $meetingArr = $this->db->getall($sqlStr);