diff --git a/controller/studentMeetingController.js b/controller/studentMeetingController.js index ebeae9f..e1c1cba 100644 --- a/controller/studentMeetingController.js +++ b/controller/studentMeetingController.js @@ -81,6 +81,7 @@ studentMeetingController.prototype.updateStudentMeetingBySite = async(ctx, next) try { let Id = ctx.params.id; var body = ctx.request.body; + let smdata = await studentMeetingService.updateStudentMeetingBySite(Id,body) return smdata; } catch (error) { @@ -93,7 +94,7 @@ studentMeetingController.prototype.getStudentMeetingByStudentId = async(ctx, nex let Id = ctx.params.id; 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 student = await studentMeetingService.updateStudentMeetingBySite(Id,page,pageno); + let student = await studentMeetingService.getStudentMeetingByStudentId(Id,page,pageno); return student; } catch (error) { throw error; diff --git a/services/studentMeetingService.js b/services/studentMeetingService.js index 78aab7f..bb38b65 100644 --- a/services/studentMeetingService.js +++ b/services/studentMeetingService.js @@ -85,14 +85,14 @@ studentMeetingService.prototype.getStudentMeetingBySite = async(siteId,page=1,pa studentMeetingService.prototype.updateStudentMeetingBySite = async(id,data) =>{ try { - let studentMeeting = await studentMeeting.update(data,{where:{id:id}}); - return studentMeeting; + let studentMeetingS = await studentMeeting.update(data,{where:{id:id}}); + return studentMeetingS; } catch (error) { throw error; } } -studentMeetingService.prototype.updateStudentMeetingBySite = async(id,page=1,pageno=8) =>{ +studentMeetingService.prototype.getStudentMeetingByStudentId = async(id,page=1,pageno=8) =>{ let querySql = `SELECT 3u.*, 3meet.meeting_name, 3meet.meeting_status meetingStatus, @@ -112,7 +112,8 @@ studentMeetingService.prototype.updateStudentMeetingBySite = async(id,page=1,pag LEFT JOIN 3m_meeting 3meet ON 3meet.id = 3sm.meeting_id WHERE 3sm.student_id = '` +id+"'";; -querySql += ' ORDER BY 3sm.create_time DESC LIMIT '+(page-1)*pageno+' , ' +pageno + +querySql += ' AND 3sm.status != 5 ORDER BY 3sm.create_time DESC LIMIT '+(page-1)*pageno+' , ' +pageno let sm = await sequelize.query(querySql); return sm[0]; }