|
@@ -225,7 +225,7 @@ class openmeetClassAction extends openapiAction
|
|
|
) t";
|
|
) t";
|
|
|
$meetCon = $this->db->getall($sqlStr);
|
|
$meetCon = $this->db->getall($sqlStr);
|
|
|
|
|
|
|
|
- $list[$i][] = [
|
|
|
|
|
|
|
+ $list[$i] = [
|
|
|
'meeting_room_id' => $data['id'],
|
|
'meeting_room_id' => $data['id'],
|
|
|
'meeting_room_name' => $data['room_name'],
|
|
'meeting_room_name' => $data['room_name'],
|
|
|
'meeting_room_state' => $meetingHave[0]['con'] ?? 0 > 0 ? 1 : 0,
|
|
'meeting_room_state' => $meetingHave[0]['con'] ?? 0 > 0 ? 1 : 0,
|
|
@@ -274,7 +274,7 @@ class openmeetClassAction extends openapiAction
|
|
|
$meet_time = date("H:i", strtotime($meet['start_time'])).' ~ '.date("H:i", strtotime($meet['end_time']));
|
|
$meet_time = date("H:i", strtotime($meet['start_time'])).' ~ '.date("H:i", strtotime($meet['end_time']));
|
|
|
$state_code = m("meeting")->meetingState($meet['start_time'], $meet['end_time'], 1);
|
|
$state_code = m("meeting")->meetingState($meet['start_time'], $meet['end_time'], 1);
|
|
|
$state_text = m("meeting")->meetingState($meet['start_time'], $meet['end_time'], 2);
|
|
$state_text = m("meeting")->meetingState($meet['start_time'], $meet['end_time'], 2);
|
|
|
- $list["meeting_list"][$i][] = [
|
|
|
|
|
|
|
+ $list["meeting_list"][$i] = [
|
|
|
"meeting_id" => $meet['id'],
|
|
"meeting_id" => $meet['id'],
|
|
|
"meeting_name" => str_replace("\n", "",$meet['title']),
|
|
"meeting_name" => str_replace("\n", "",$meet['title']),
|
|
|
"meeting_time" => $meet_time,
|
|
"meeting_time" => $meet_time,
|
|
@@ -396,20 +396,20 @@ class openmeetClassAction extends openapiAction
|
|
|
$meetingTopic[$index]['text'] = $info['topic_title'];
|
|
$meetingTopic[$index]['text'] = $info['topic_title'];
|
|
|
$meetingTopic[$index]['personnel_list'] = str_replace("\n", "<br />", $info['topic_info']);
|
|
$meetingTopic[$index]['personnel_list'] = str_replace("\n", "<br />", $info['topic_info']);
|
|
|
|
|
|
|
|
- if ($info['topic_state'] == 2) {
|
|
|
|
|
- // 当前议题 + 参会人员
|
|
|
|
|
- $data['participants'][] = [
|
|
|
|
|
- "topics" => $info['topic_title'],
|
|
|
|
|
- "personnel_list" => str_replace("\n", "<br />", $info['topic_info']),
|
|
|
|
|
- ];
|
|
|
|
|
- // 下一议题 + 参会人员
|
|
|
|
|
- if (isset($topics[$i + 1])) {
|
|
|
|
|
- $data['participants'][] = [
|
|
|
|
|
- "topics" => $topics[$i + 1]['topic_title'],
|
|
|
|
|
- "personnel_list" => str_replace("\n", "<br />", $topics[$i + 1]['topic_info']),
|
|
|
|
|
- ];
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
|
|
+// if ($info['topic_state'] == 2) {
|
|
|
|
|
+// // 当前议题 + 参会人员
|
|
|
|
|
+// $data['participants'][] = [
|
|
|
|
|
+// "topics" => $info['topic_title'],
|
|
|
|
|
+// "personnel_list" => str_replace("\n", "<br />", $info['topic_info']),
|
|
|
|
|
+// ];
|
|
|
|
|
+// // 下一议题 + 参会人员
|
|
|
|
|
+// if (isset($topics[$i + 1])) {
|
|
|
|
|
+// $data['participants'][] = [
|
|
|
|
|
+// "topics" => $topics[$i + 1]['topic_title'],
|
|
|
|
|
+// "personnel_list" => str_replace("\n", "<br />", $topics[$i + 1]['topic_info']),
|
|
|
|
|
+// ];
|
|
|
|
|
+// }
|
|
|
|
|
+// }
|
|
|
}
|
|
}
|
|
|
$info['meetingTopic'] = $meetingTopic;
|
|
$info['meetingTopic'] = $meetingTopic;
|
|
|
|
|
|
