|
|
@@ -274,7 +274,7 @@ class openmeetClassAction extends openapiAction
|
|
|
|
|
|
|
|
|
$sqlStr = /** @lang text */
|
|
|
- "SELECT 1 as type, id, title, start_time, end_time, null compere, '办公会议' as meeting_type, null as tzone, meet_state
|
|
|
+ "SELECT 1 as type, id, title, start_time, end_time, null compere, case when fixed = 1 then '固定会议' else '办公会议' end as meeting_type, null as tzone, meet_state
|
|
|
FROM `[Q]meeting`
|
|
|
WHERE `status` = 1
|
|
|
and `start_time` regexp '".$dataDate."'
|
|
|
@@ -412,7 +412,7 @@ class openmeetClassAction extends openapiAction
|
|
|
"meeting_moderator"=>null,
|
|
|
"meeting_state"=>$meetInfo['meet_state'],
|
|
|
"meeting_state_text"=>m('meeting')->hyarra[$meetInfo['meet_state']],
|
|
|
- "meeting_type"=>"办公会议",
|
|
|
+ "meeting_type"=> $meetInfo["fixed"] == 1 ? "固定会议" : "办公会议",
|
|
|
"meeting_attendees"=>[
|
|
|
[
|
|
|
"label"=>"参会部门及人员",
|
