|
@@ -76,19 +76,116 @@ class openmeetClassAction extends openapiAction
|
|
|
];
|
|
|
}
|
|
|
|
|
|
- $meetData = m('meeting')->getone(" meet_state = 1 and meeting_room = '{$rawData['room_name']}'");
|
|
|
+ $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']."'
|
|
|
+ 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']."'";
|
|
|
|
|
|
- if (!isset($meetData['id'])) {
|
|
|
+ $meetData = $this->db->getall($sqlStr);
|
|
|
+
|
|
|
+ if (count($meetData) == 0) {
|
|
|
return [
|
|
|
"code"=>2,
|
|
|
"message"=>"暂无会议!",
|
|
|
"data"=>[
|
|
|
- "meetingState"=>False
|
|
|
+ "meetingState"=>False,
|
|
|
+ "data" => $rawData['room_name']
|
|
|
]
|
|
|
];
|
|
|
}
|
|
|
|
|
|
- $topics = $this->db->getall("select `id`, `topic_title`, `topic_attendee`, `topic_state` from `[Q]meeting_topics` where mid = {$meetData['id']} order by sort");
|
|
|
+
|
|
|
+ $data = [];
|
|
|
+
|
|
|
+ for ($i = 0; $i < count($meetData); $i++) {
|
|
|
+ $meeting = $meetData[$i];
|
|
|
+ $data['meeting_list'][$i] = [
|
|
|
+ "meeting_name"=>$meeting['title'],
|
|
|
+ "meeting_time"=>date("H:i", strtotime($meeting['start_time'])).' ~ '.date("H:i", strtotime($meeting['end_time'])),
|
|
|
+ "meeting_moderator"=>$meeting['compere'],
|
|
|
+ "meeting_state"=>$meeting['meet_state'],
|
|
|
+ "meeting_state_text"=>m("meeting")->hyarra[$meeting['meet_state']],
|
|
|
+ ];
|
|
|
+
|
|
|
+ // 时间到了自动结束一下
|
|
|
+ if ($meeting['end_time'] < date("Y-m-d H:i:s")) {
|
|
|
+ if ($meeting['type'] == 1) {
|
|
|
+ m("meeting")->update(["meet_state"=>2], "id=".$meeting['id']);
|
|
|
+ } else {
|
|
|
+ m("meeting_key")->update(["meet_state"=>2], "id=".$meeting['id']);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ $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']."'
|
|
|
+ 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']."'";
|
|
|
+ $nowMeetingData = $this->db->getall($nowMeetingSql);
|
|
|
+
|
|
|
+// return $nowMeetingSql;
|
|
|
+
|
|
|
+ if (count($nowMeetingData) > 0) {
|
|
|
+ $nowMeet = $nowMeetingData[0];
|
|
|
+ $data['$basic_information'] = [
|
|
|
+ "meeting_room_name" => $nowMeet['meeting_room'],
|
|
|
+ "meeting_name" => $nowMeet['title'],
|
|
|
+ "meeting_time" => date("H:i", strtotime($nowMeet['start_time'])).' ~ '.date("H:i", strtotime($nowMeet['end_time'])),
|
|
|
+ "meeting_moderator" => $nowMeet['compere'],
|
|
|
+ ];
|
|
|
+ if ($nowMeet['type'] == 2) {
|
|
|
+ $topics = $this->db->getall("select `id`, `topic_title`, `topic_attendee`, `topic_state`, `topic_info` from `[Q]meeting_topics` where mid = {$nowMeet['id']} order by sort");
|
|
|
+ $this_topics = [];
|
|
|
+ $next_topics = [];
|
|
|
+ // 会议议题处理
|
|
|
+ for ($i = 0; $i < count($topics); $i++) {
|
|
|
+ $info = $topics[$i];
|
|
|
+ $data['meetingTopic'][$i]['state'] = $info['topic_state'];
|
|
|
+ $data['meetingTopic'][$i]['tip'] = m("meeting")->ytarra[$info['topic_state']];
|
|
|
+ $data['meetingTopic'][$i]['text'] = $info['topic_title'];
|
|
|
+ if ($info['topic_state'] == 2) {
|
|
|
+ $this_topics = [
|
|
|
+ "topics" => $info['topic_title'],
|
|
|
+ "personnel_list" => $info['topic_info'],
|
|
|
+ ];
|
|
|
+
|
|
|
+ if (isset($topics[$i + 1])) {
|
|
|
+ $next_topics = [
|
|
|
+ "topics" => $topics[$i + 1]['topic_title'],
|
|
|
+ "personnel_list" => $topics[$i + 1]['topic_info'],
|
|
|
+ ];
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ $data['participants'][] = $this_topics;
|
|
|
+ $data['participants'][] = $next_topics;
|
|
|
+
|
|
|
+ } else {
|
|
|
+ $data['meetingTopic'] = [];
|
|
|
+ $data['participants'] = [];
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ $data['$basic_information'] = [
|
|
|
+ "meeting_room_name" => "空闲中",
|
|
|
+ "meeting_name" => null,
|
|
|
+ "meeting_time" => null,
|
|
|
+ "meeting_moderator" => null,
|
|
|
+ ];
|
|
|
+ $data['meetingTopic'] = [];
|
|
|
+ $data['participants'] = [];
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ return $data;
|
|
|
+
|
|
|
+// $topicMeetingSql = /** @lang text */
|
|
|
+// "SELECT id FROM `xinhu_meeting_key` where meet_state = 1 and start_time REGEXP '".date("Y-m-d H:i:s")."' and meeting_room = '".$rawData['room_name']."'";
|
|
|
+
|
|
|
+// $topicMeetingData = $this->db->getall($topicMeetingSql);
|
|
|
+
|
|
|
+// $topics = $this->db->getall("select `id`, `topic_title`, `topic_attendee`, `topic_state` from `[Q]meeting_topics` where mid = {$topicMeetingSql['id']} order by sort");
|
|
|
|
|
|
|
|
|
// 将日期时间字符串转换为UNIX时间戳
|
|
@@ -146,7 +243,6 @@ class openmeetClassAction extends openapiAction
|
|
|
case 3:
|
|
|
$info = '已结束';
|
|
|
break;
|
|
|
-
|
|
|
}
|
|
|
return $info;
|
|
|
}
|