Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
付智勇
/
koa2_Sequelize_project
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
付智勇
8 years ago
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
defa507bc44a903d0b32386323f5189dd831e541
defa507b
1 parent
fa44c5a1
课堂分页
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
7 行增加
和
6 行删除
controller/meetingController.js
services/meetingService.js
controller/meetingController.js
查看文件 @
defa507
...
...
@@ -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
)
...
...
services/meetingService.js
查看文件 @
defa507
...
...
@@ -104,12 +104,11 @@ meetingService.prototype.getMeeting = async(queryData,page = 1,pageno =12) =>{
}
if(queryData.id){
sql += "
and
3
m_meeting
.
id
=
'" + queryData.id+"'
";
}
}
if(queryData.meetingStatus){
sql += "
and
3
m_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
}
...
...
请
注册
或
登录
后发表评论