正在显示
1 个修改的文件
包含
9 行增加
和
4 行删除
| @@ -95,6 +95,9 @@ meetingService.prototype.getMeeting = async(queryData,page = 1,pageno =12) =>{ | @@ -95,6 +95,9 @@ meetingService.prototype.getMeeting = async(queryData,page = 1,pageno =12) =>{ | ||
| 95 | if(queryData.create_user){ | 95 | if(queryData.create_user){ |
| 96 | sql += " and 3m_meeting.create_user = '" + queryData.create_user+"'"; | 96 | sql += " and 3m_meeting.create_user = '" + queryData.create_user+"'"; |
| 97 | } | 97 | } |
| 98 | + if(queryData.id){ | ||
| 99 | + sql += " and 3m_meeting.id = '" + queryData.id+"'"; | ||
| 100 | +} | ||
| 98 | if(queryData.meetingStatus){ | 101 | if(queryData.meetingStatus){ |
| 99 | sql += " and 3m_meeting.meeting_type = '" + queryData.meetingStatus+"'"; | 102 | sql += " and 3m_meeting.meeting_type = '" + queryData.meetingStatus+"'"; |
| 100 | } | 103 | } |
| @@ -154,16 +157,18 @@ meetingService.prototype.getAllMeetingBySiteID = async(params)=>{ | @@ -154,16 +157,18 @@ meetingService.prototype.getAllMeetingBySiteID = async(params)=>{ | ||
| 154 | 157 | ||
| 155 | meetingService.prototype.recording = async(params)=>{ | 158 | meetingService.prototype.recording = async(params)=>{ |
| 156 | try { | 159 | try { |
| 157 | - let newURL = 'http://'+params.siteId+'.xuedianyun.com/3m/doPlayRecord.do?meetingNumber=' | 160 | + let newURL = 'http://'+params.siteId+'.xuedianyun.com/3m/doPlayRecord.do?meetingNumber='; |
| 161 | + let oldURL = 'http://saas.3mang.com:80/3m/attend.do?meetingNumber='+meetingId+'&streamNameOfRecord='+meetingId+'_'; | ||
| 158 | let Meeting = await meetingModel.findOne({where:{id:params.meetingId}}); | 162 | let Meeting = await meetingModel.findOne({where:{id:params.meetingId}}); |
| 159 | if(Meeting){ | 163 | if(Meeting){ |
| 160 | return {url:newURL+Meeting.meetingNumber} | 164 | return {url:newURL+Meeting.meetingNumber} |
| 161 | }else{ | 165 | }else{ |
| 166 | + let oldMeeting = await oldMeetingModel.findOne({where:{id:params.meetingId}}); | ||
| 167 | + if(!oldMeeting){ | ||
| 168 | + return {code:11,msg:'课堂不存在'} | ||
| 169 | + }else{ | ||
| 162 | 170 | ||
| 163 | } | 171 | } |
| 164 | - let oldMeeting = await oldMeetingModel.findAll({where:{siteId:params.meetingId}}); | ||
| 165 | - if(!Meeting){ | ||
| 166 | - return {code:11,msg:'课堂不存在'} | ||
| 167 | } | 172 | } |
| 168 | return {meeting:Meeting.concat(oldMeeting)} | 173 | return {meeting:Meeting.concat(oldMeeting)} |
| 169 | } catch (error) { | 174 | } catch (error) { |
-
请 注册 或 登录 后发表评论