From defa507bc44a903d0b32386323f5189dd831e541 Mon Sep 17 00:00:00 2001
From: 付智勇 <fuzhiyong@efangtec.com>
Date: Mon, 25 Sep 2017 11:18:47 +0800
Subject: [PATCH] 课堂分页
---
controller/meetingController.js | 4 +++-
services/meetingService.js | 9 ++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/controller/meetingController.js b/controller/meetingController.js
index f416286..aa39ad0 100644
--- a/controller/meetingController.js
+++ b/controller/meetingController.js
@@ -228,7 +228,9 @@ meetingController.prototype.updateMeeting = async(ctx,next) =>{
meetingController.prototype.getAllMeetingBySiteID = async(ctx,next)=>{
try {
let params = ctx.request.body;
- let updateMeeting = meetingService.getAllMeetingBySiteID(params)
+ let page = ctx.header.page ? Number(ctx.header.page):ctx.header.page;
+ let pageno = ctx.header.pageno ? Number(ctx.header.pageno):ctx.header.pageno;
+ let updateMeeting = meetingService.getAllMeetingBySiteID(params,page,pageno)
return updateMeeting;
} catch (error) {
console.log(error)
diff --git a/services/meetingService.js b/services/meetingService.js
index 3e58738..fef2c3c 100644
--- a/services/meetingService.js
+++ b/services/meetingService.js
@@ -104,12 +104,11 @@ meetingService.prototype.getMeeting = async(queryData,page = 1,pageno =12) =>{
}
if(queryData.id){
sql += " and 3m_meeting.id = '" + queryData.id+"'";
-}
+ }
if(queryData.meetingStatus){
sql += " and 3m_meeting.meeting_type = '" + queryData.meetingStatus+"'";
}
sql += ' ORDER BY 3m_meeting.create_time DESC LIMIT '+(page-1)*pageno+' , ' +pageno
- console.log('课堂列表',sql);
let backMeeting = await sequelize.query(sql);
//let backMeeting = await meetingModel.findAll({where:queryData,order:[['createTime', 'DESC']], offset: (page-1)*pageno, limit: pageno});
let count = await meetingModel.count({where:queryData})
@@ -147,7 +146,7 @@ meetingService.prototype.updateMeeting = async(params,meetingId) =>{
}
}
-meetingService.prototype.getAllMeetingBySiteID = async(params)=>{
+meetingService.prototype.getAllMeetingBySiteID = async(params,page = 1,pageno =10)=>{
try {
let oldMeeting = await oldMeetingModel.findAll({where:{siteId:params.meetingId}});
let oldMeetingCont = await oldMeetingModel.count({where:{siteId:params.meetingId}});
@@ -160,8 +159,8 @@ meetingService.prototype.getAllMeetingBySiteID = async(params)=>{
await meetingdata.sort(function(m1,m2){
return new Date(m2.beginTime).getTime() - new Date(m1.beginTime).getTime();
});
-
- return {meeting:meetingdata}
+ console.log((page-1)*pageno,(page-1)*pageno+10)
+ return {meeting:meetingdata.slice((page-1)*pageno,(page-1)*pageno+pageno)}
} catch (error) {
throw error
}
--
libgit2 0.24.0