|
@@ -213,7 +213,7 @@ class openmeetClassAction extends openapiAction
|
|
UNION ALL
|
|
UNION ALL
|
|
SELECT 1 FROM `[Q]meeting_key`
|
|
SELECT 1 FROM `[Q]meeting_key`
|
|
WHERE `start_time` REGEXP '".$dataDate."'
|
|
WHERE `start_time` REGEXP '".$dataDate."'
|
|
- and `meet_state` == 1
|
|
|
|
|
|
+ and `meet_state` = 1
|
|
and `room_id` = '".$data['id']."'
|
|
and `room_id` = '".$data['id']."'
|
|
) t";
|
|
) t";
|
|
$meetingHave = $this->db->getall($sqlStr);
|
|
$meetingHave = $this->db->getall($sqlStr);
|
|
@@ -282,7 +282,7 @@ class openmeetClassAction extends openapiAction
|
|
and `end_time` > now()
|
|
and `end_time` > now()
|
|
and `room_id` = '".$roomId."'
|
|
and `room_id` = '".$roomId."'
|
|
UNION ALL
|
|
UNION ALL
|
|
- SELECT 2 as type, id, title, start_time, end_time, compere, '党委会议' as meeting_type, tzone, meet_state
|
|
|
|
|
|
+ SELECT 2 as type, id, title, start_time, end_time, compere, '重要会议' as meeting_type, tzone, meet_state
|
|
FROM `[Q]meeting_key`
|
|
FROM `[Q]meeting_key`
|
|
WHERE `start_time` regexp '".$dataDate."'
|
|
WHERE `start_time` regexp '".$dataDate."'
|
|
and `meet_state` != 2
|
|
and `meet_state` != 2
|
|
@@ -443,7 +443,7 @@ class openmeetClassAction extends openapiAction
|
|
"meeting_state_text"=>m('meeting')->hyarra[$meetInfo['meet_state']],
|
|
"meeting_state_text"=>m('meeting')->hyarra[$meetInfo['meet_state']],
|
|
"meeting_type"=>"重要会议"
|
|
"meeting_type"=>"重要会议"
|
|
];
|
|
];
|
|
-
|
|
|
|
|
|
+
|
|
if (!empty(trim($meetInfo['attendees']))) {
|
|
if (!empty(trim($meetInfo['attendees']))) {
|
|
$info['basic_information']["meeting_attendees"][] = [
|
|
$info['basic_information']["meeting_attendees"][] = [
|
|
"label"=>"出席",
|
|
"label"=>"出席",
|
|
@@ -457,7 +457,10 @@ class openmeetClassAction extends openapiAction
|
|
"text"=>str_replace("\n", " ", $meetInfo['attends']),
|
|
"text"=>str_replace("\n", " ", $meetInfo['attends']),
|
|
];
|
|
];
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
|
|
+ if (!isset($info['basic_information']["meeting_attendees"])) {
|
|
|
|
+ $info['basic_information']["meeting_attendees"] = [];
|
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
// 会议议题
|
|
// 会议议题
|