正在显示
2 个修改的文件
包含
7 行增加
和
6 行删除
| @@ -228,7 +228,9 @@ meetingController.prototype.updateMeeting = async(ctx,next) =>{ | @@ -228,7 +228,9 @@ meetingController.prototype.updateMeeting = async(ctx,next) =>{ | ||
| 228 | meetingController.prototype.getAllMeetingBySiteID = async(ctx,next)=>{ | 228 | meetingController.prototype.getAllMeetingBySiteID = async(ctx,next)=>{ |
| 229 | try { | 229 | try { |
| 230 | let params = ctx.request.body; | 230 | let params = ctx.request.body; |
| 231 | - let updateMeeting = meetingService.getAllMeetingBySiteID(params) | 231 | + let page = ctx.header.page ? Number(ctx.header.page):ctx.header.page; |
| 232 | + let pageno = ctx.header.pageno ? Number(ctx.header.pageno):ctx.header.pageno; | ||
| 233 | + let updateMeeting = meetingService.getAllMeetingBySiteID(params,page,pageno) | ||
| 232 | return updateMeeting; | 234 | return updateMeeting; |
| 233 | } catch (error) { | 235 | } catch (error) { |
| 234 | console.log(error) | 236 | console.log(error) |
| @@ -104,12 +104,11 @@ meetingService.prototype.getMeeting = async(queryData,page = 1,pageno =12) =>{ | @@ -104,12 +104,11 @@ meetingService.prototype.getMeeting = async(queryData,page = 1,pageno =12) =>{ | ||
| 104 | } | 104 | } |
| 105 | if(queryData.id){ | 105 | if(queryData.id){ |
| 106 | sql += " and 3m_meeting.id = '" + queryData.id+"'"; | 106 | sql += " and 3m_meeting.id = '" + queryData.id+"'"; |
| 107 | -} | 107 | + } |
| 108 | if(queryData.meetingStatus){ | 108 | if(queryData.meetingStatus){ |
| 109 | sql += " and 3m_meeting.meeting_type = '" + queryData.meetingStatus+"'"; | 109 | sql += " and 3m_meeting.meeting_type = '" + queryData.meetingStatus+"'"; |
| 110 | } | 110 | } |
| 111 | sql += ' ORDER BY 3m_meeting.create_time DESC LIMIT '+(page-1)*pageno+' , ' +pageno | 111 | sql += ' ORDER BY 3m_meeting.create_time DESC LIMIT '+(page-1)*pageno+' , ' +pageno |
| 112 | - console.log('课堂列表',sql); | ||
| 113 | let backMeeting = await sequelize.query(sql); | 112 | let backMeeting = await sequelize.query(sql); |
| 114 | //let backMeeting = await meetingModel.findAll({where:queryData,order:[['createTime', 'DESC']], offset: (page-1)*pageno, limit: pageno}); | 113 | //let backMeeting = await meetingModel.findAll({where:queryData,order:[['createTime', 'DESC']], offset: (page-1)*pageno, limit: pageno}); |
| 115 | let count = await meetingModel.count({where:queryData}) | 114 | let count = await meetingModel.count({where:queryData}) |
| @@ -147,7 +146,7 @@ meetingService.prototype.updateMeeting = async(params,meetingId) =>{ | @@ -147,7 +146,7 @@ meetingService.prototype.updateMeeting = async(params,meetingId) =>{ | ||
| 147 | } | 146 | } |
| 148 | } | 147 | } |
| 149 | 148 | ||
| 150 | -meetingService.prototype.getAllMeetingBySiteID = async(params)=>{ | 149 | +meetingService.prototype.getAllMeetingBySiteID = async(params,page = 1,pageno =10)=>{ |
| 151 | try { | 150 | try { |
| 152 | let oldMeeting = await oldMeetingModel.findAll({where:{siteId:params.meetingId}}); | 151 | let oldMeeting = await oldMeetingModel.findAll({where:{siteId:params.meetingId}}); |
| 153 | let oldMeetingCont = await oldMeetingModel.count({where:{siteId:params.meetingId}}); | 152 | let oldMeetingCont = await oldMeetingModel.count({where:{siteId:params.meetingId}}); |
| @@ -160,8 +159,8 @@ meetingService.prototype.getAllMeetingBySiteID = async(params)=>{ | @@ -160,8 +159,8 @@ meetingService.prototype.getAllMeetingBySiteID = async(params)=>{ | ||
| 160 | await meetingdata.sort(function(m1,m2){ | 159 | await meetingdata.sort(function(m1,m2){ |
| 161 | return new Date(m2.beginTime).getTime() - new Date(m1.beginTime).getTime(); | 160 | return new Date(m2.beginTime).getTime() - new Date(m1.beginTime).getTime(); |
| 162 | }); | 161 | }); |
| 163 | - | ||
| 164 | - return {meeting:meetingdata} | 162 | + console.log((page-1)*pageno,(page-1)*pageno+10) |
| 163 | + return {meeting:meetingdata.slice((page-1)*pageno,(page-1)*pageno+pageno)} | ||
| 165 | } catch (error) { | 164 | } catch (error) { |
| 166 | throw error | 165 | throw error |
| 167 | } | 166 | } |
-
请 注册 或 登录 后发表评论