|
@@ -96,7 +96,7 @@ class flow_meetingClassModel extends flowModel
|
|
|
$rs['meet_state'] = $this->getstatezt($zt);
|
|
|
if (!empty($room_id)) $rs['room_id'] = $this->meeting_room[$room_id]['room_name']."({$this->meeting_room[$room_id]['desc']})"; // 会议室Id替换会议室名
|
|
|
$rs['state_info'] = $this->getApproval($rs['nowcheckname'] ?? '');
|
|
|
- $meet_dev = ["不需要", "视频会议", "LED屏"];
|
|
|
+ $meet_dev = ["不需要", "远程视频会议", "电子大屏"];
|
|
|
$rs['meet_dev'] = $rs['meet_dev'] == 0 ? $meet_dev[$rs['meet_dev']] : "<font color=red>".$meet_dev[$rs['meet_dev']]."</font>";
|
|
|
$rs['fixed'] = $rs['fixed'] == 1 ? '是' : '否'; // 是否固定会议
|
|
|
|
|
@@ -240,6 +240,7 @@ class flow_meetingClassModel extends flowModel
|
|
|
$meeting = m("meeting")->getone("id={$this->id}");
|
|
|
|
|
|
$meetTime = $meeting['start_time']; // 时间
|
|
|
+ $meetTime = date('Y年m月d日H点i分', strtotime($meetTime));
|
|
|
$meetName = $meeting['title']; // 主题
|
|
|
$meetRoom = $meeting['meeting_room']; // 地点
|
|
|
|
|
@@ -261,7 +262,7 @@ class flow_meetingClassModel extends flowModel
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- // 获取用户电话
|
|
|
+ // 用户:获取用户电话
|
|
|
if (count($userIds) > 0) {
|
|
|
// 获取所有用户信息
|
|
|
$uInfo = m("admin")->getall("id in (".implode(',', $userIds).")");
|
|
@@ -286,6 +287,7 @@ class flow_meetingClassModel extends flowModel
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ // 部门
|
|
|
if (count($deptIds) > 0) {
|
|
|
$deptSql = "select distinct b.mobile, a.name from [Q]dept a left join [Q]admin b on a.headid = b.id where a.id in (".implode(',', $deptIds).") ";
|
|
|
|
|
@@ -293,6 +295,8 @@ class flow_meetingClassModel extends flowModel
|
|
|
for ($i = 0; $i < count($dInfo); $i++) {
|
|
|
$mobile = $dInfo[$i]['mobile'];
|
|
|
$name = $dInfo[$i]['name'];
|
|
|
+ $name = str_replace('中心', '部', $name);
|
|
|
+
|
|
|
if (empty($mobile)) {
|
|
|
$nullMobileArr['dept'][] = $name;
|
|
|
continue;
|
|
@@ -337,6 +341,7 @@ class flow_meetingClassModel extends flowModel
|
|
|
$meeting = m("meeting")->getone("id={$this->id}");
|
|
|
|
|
|
$meetTime = $meeting['start_time']; // 时间
|
|
|
+ $meetTime = date('Y年m月d日H点i分', strtotime($meetTime));
|
|
|
$meetName = $meeting['title']; // 主题
|
|
|
$smsInfo = [];
|
|
|
m("log")->addlog("会议室审批", "发送短信提醒会议室管理员");
|