正在显示
2 个修改的文件
包含
7 行增加
和
5 行删除
@@ -81,6 +81,7 @@ studentMeetingController.prototype.updateStudentMeetingBySite = async(ctx, next) | @@ -81,6 +81,7 @@ studentMeetingController.prototype.updateStudentMeetingBySite = async(ctx, next) | ||
81 | try { | 81 | try { |
82 | let Id = ctx.params.id; | 82 | let Id = ctx.params.id; |
83 | var body = ctx.request.body; | 83 | var body = ctx.request.body; |
84 | + | ||
84 | let smdata = await studentMeetingService.updateStudentMeetingBySite(Id,body) | 85 | let smdata = await studentMeetingService.updateStudentMeetingBySite(Id,body) |
85 | return smdata; | 86 | return smdata; |
86 | } catch (error) { | 87 | } catch (error) { |
@@ -93,7 +94,7 @@ studentMeetingController.prototype.getStudentMeetingByStudentId = async(ctx, nex | @@ -93,7 +94,7 @@ studentMeetingController.prototype.getStudentMeetingByStudentId = async(ctx, nex | ||
93 | let Id = ctx.params.id; | 94 | let Id = ctx.params.id; |
94 | let page = ctx.header.page ? Number(ctx.header.page):ctx.header.page; | 95 | let page = ctx.header.page ? Number(ctx.header.page):ctx.header.page; |
95 | let pageno = ctx.header.pageno ? Number(ctx.header.pageno):ctx.header.pageno; | 96 | let pageno = ctx.header.pageno ? Number(ctx.header.pageno):ctx.header.pageno; |
96 | - let student = await studentMeetingService.updateStudentMeetingBySite(Id,page,pageno); | 97 | + let student = await studentMeetingService.getStudentMeetingByStudentId(Id,page,pageno); |
97 | return student; | 98 | return student; |
98 | } catch (error) { | 99 | } catch (error) { |
99 | throw error; | 100 | throw error; |
@@ -85,14 +85,14 @@ studentMeetingService.prototype.getStudentMeetingBySite = async(siteId,page=1,pa | @@ -85,14 +85,14 @@ studentMeetingService.prototype.getStudentMeetingBySite = async(siteId,page=1,pa | ||
85 | 85 | ||
86 | studentMeetingService.prototype.updateStudentMeetingBySite = async(id,data) =>{ | 86 | studentMeetingService.prototype.updateStudentMeetingBySite = async(id,data) =>{ |
87 | try { | 87 | try { |
88 | - let studentMeeting = await studentMeeting.update(data,{where:{id:id}}); | ||
89 | - return studentMeeting; | 88 | + let studentMeetingS = await studentMeeting.update(data,{where:{id:id}}); |
89 | + return studentMeetingS; | ||
90 | } catch (error) { | 90 | } catch (error) { |
91 | throw error; | 91 | throw error; |
92 | } | 92 | } |
93 | } | 93 | } |
94 | 94 | ||
95 | -studentMeetingService.prototype.updateStudentMeetingBySite = async(id,page=1,pageno=8) =>{ | 95 | +studentMeetingService.prototype.getStudentMeetingByStudentId = async(id,page=1,pageno=8) =>{ |
96 | let querySql = `SELECT | 96 | let querySql = `SELECT |
97 | 3u.*, 3meet.meeting_name, | 97 | 3u.*, 3meet.meeting_name, |
98 | 3meet.meeting_status meetingStatus, | 98 | 3meet.meeting_status meetingStatus, |
@@ -112,7 +112,8 @@ studentMeetingService.prototype.updateStudentMeetingBySite = async(id,page=1,pag | @@ -112,7 +112,8 @@ studentMeetingService.prototype.updateStudentMeetingBySite = async(id,page=1,pag | ||
112 | LEFT JOIN 3m_meeting 3meet ON 3meet.id = 3sm.meeting_id | 112 | LEFT JOIN 3m_meeting 3meet ON 3meet.id = 3sm.meeting_id |
113 | WHERE | 113 | WHERE |
114 | 3sm.student_id = '` +id+"'";; | 114 | 3sm.student_id = '` +id+"'";; |
115 | -querySql += ' ORDER BY 3sm.create_time DESC LIMIT '+(page-1)*pageno+' , ' +pageno | 115 | + |
116 | +querySql += ' AND 3sm.status != 5 ORDER BY 3sm.create_time DESC LIMIT '+(page-1)*pageno+' , ' +pageno | ||
116 | let sm = await sequelize.query(querySql); | 117 | let sm = await sequelize.query(querySql); |
117 | return sm[0]; | 118 | return sm[0]; |
118 | } | 119 | } |
-
请 注册 或 登录 后发表评论