会议出席

webmain/task/openapi/openmeetAction.php

@@ -42,6 +42,7 @@ class openmeetClassAction extends openapiAction
 
         $meetData = $this->db->getall($sqlStr);
 
+        // 没有会议
         if (count($meetData) == 0) {
             $this->showreturn(
                 [
@@ -61,6 +62,7 @@ class openmeetClassAction extends openapiAction
 
         $data = [];
 
+        // 有会议循环处理一下
         for ($i = 0; $i < count($meetData); $i++) {
             $meeting = $meetData[$i];
             $data['meeting_list'][$i] = [
@@ -94,28 +96,29 @@ class openmeetClassAction extends openapiAction
 
         $nowMeetingSql = /** @lang text */
             "select * from (
-            SELECT 1 as type, id, title, start_time, end_time, null as compere, meet_state, meeting_room, attendees
+            SELECT 1 as type, id, title, start_time, end_time, null as compere, meet_state, meeting_room, attendees, null as attends
                FROM `[Q]meeting` 
               where status = 1 
                 and 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, null as attendees
+             SELECT 2 as type, id, title, start_time, end_time, compere, meet_state, meeting_room, attendees, attends
                FROM `[Q]meeting_key` 
               where start_time < now() and end_time > now() and meeting_room = '".$rawData['room_name']."'
               ) as t order by start_time";
         $nowMeetingData = $this->db->getall($nowMeetingSql);
 
-
+        // 有数据，且未结束
         if (count($nowMeetingData) > 0 && $nowMeetingData[0]['meet_state'] != 2) {
             $nowMeet = $nowMeetingData[0];
-
+            $attInfo = $nowMeet['type'] == 2 ? "出席：".$nowMeet['attendees']."<br />列席：".$nowMeet['attends'] : "";
             $data['basic_information'] = [
                 "meeting_room_name" => $nowMeet['meeting_room'],
                 "meeting_name" => str_replace("\n", "",$nowMeet['title']),
                 "meeting_time" => date("H:i", strtotime($nowMeet['start_time'])).' ~ '.date("H:i", strtotime($nowMeet['end_time'])),
                 "meeting_moderator" => $nowMeet['compere'],
+                "meeting_attendees"=>$attInfo
             ];
             $data['meetingTopic'] = [];
             $data['participants'] = [];