正在显示
4 个修改的文件
包含
51 行增加
和
1 行删除
@@ -170,7 +170,6 @@ meetingController.prototype.getMeeting = async(ctx,next) =>{ | @@ -170,7 +170,6 @@ meetingController.prototype.getMeeting = async(ctx,next) =>{ | ||
170 | let page = ctx.header.page ? Number(ctx.header.page):ctx.header.page; | 170 | let page = ctx.header.page ? Number(ctx.header.page):ctx.header.page; |
171 | let pageno = ctx.header.pageno ? Number(ctx.header.pageno):ctx.header.pageno; | 171 | let pageno = ctx.header.pageno ? Number(ctx.header.pageno):ctx.header.pageno; |
172 | var meetingData = await meetingService.getMeeting(meetingbody,page,pageno); | 172 | var meetingData = await meetingService.getMeeting(meetingbody,page,pageno); |
173 | - console.log(meetingData.meetingInfo) | ||
174 | return meetingData; | 173 | return meetingData; |
175 | } catch (error) { | 174 | } catch (error) { |
176 | throw error; | 175 | throw error; |
@@ -47,4 +47,15 @@ studentMeetingController.prototype.getStudentMeetingCount = async(ctx, next) =>{ | @@ -47,4 +47,15 @@ studentMeetingController.prototype.getStudentMeetingCount = async(ctx, next) =>{ | ||
47 | } | 47 | } |
48 | 48 | ||
49 | 49 | ||
50 | +studentMeetingController.prototype.queryStudentMeeting = async(ctx, next)=>{ | ||
51 | + let teacherName = ctx.params.teacherName; | ||
52 | + if(!teacherName){ | ||
53 | + return status.paramError('teacherName'); | ||
54 | + } | ||
55 | + let page = ctx.header.page ? Number(ctx.header.page):ctx.header.page; | ||
56 | + let pageno = ctx.header.pageno ? Number(ctx.header.pageno):ctx.header.pageno; | ||
57 | + let sn = await studentMeetingService.queryStudentMeeting(teacherName,page,pageno); | ||
58 | + return sn | ||
59 | +} | ||
60 | + | ||
50 | module.exports = new studentMeetingController(); | 61 | module.exports = new studentMeetingController(); |
@@ -29,6 +29,25 @@ router.get('/getStudentMeetingCount/:meetingId',async (ctx, next) => { | @@ -29,6 +29,25 @@ router.get('/getStudentMeetingCount/:meetingId',async (ctx, next) => { | ||
29 | status.catchError(ctx,400,e.message); | 29 | status.catchError(ctx,400,e.message); |
30 | } | 30 | } |
31 | }) | 31 | }) |
32 | +router.get('/delStudentMeeting/:studentMeetingId',async (ctx, next) => { | ||
33 | + try{ | ||
34 | + var data = await studentMeetingController.delStudentMeeting(ctx, next); | ||
35 | + status.successTemp(ctx,200,data); | ||
36 | + }catch(e){ | ||
37 | + console.log(e) | ||
38 | + status.catchError(ctx,400,e.message); | ||
39 | + } | ||
40 | +}) | ||
41 | + | ||
42 | +router.get('/queryStudentMeeting/:teacherName',async (ctx, next) => { | ||
43 | + try{ | ||
44 | + var data = await studentMeetingController.queryStudentMeeting(ctx, next); | ||
45 | + status.successTemp(ctx,200,data); | ||
46 | + }catch(e){ | ||
47 | + console.log(e) | ||
48 | + status.catchError(ctx,400,e.message); | ||
49 | + } | ||
50 | +}) | ||
32 | 51 | ||
33 | 52 | ||
34 | module.exports = router; | 53 | module.exports = router; |
@@ -53,4 +53,25 @@ sutudentMeetingService.prototype.getStudentMeetingCount = async(meetingId) =>{ | @@ -53,4 +53,25 @@ sutudentMeetingService.prototype.getStudentMeetingCount = async(meetingId) =>{ | ||
53 | } | 53 | } |
54 | } | 54 | } |
55 | 55 | ||
56 | + | ||
57 | +sutudentMeetingService.prototype.queryStudentMeeting = async(teacherName,page=1,pageno=8)=>{ | ||
58 | + try { | ||
59 | + let querySql = `SELECT | ||
60 | + 3u.*, 3meet.meeting_name, | ||
61 | + 3meet.create_user teacherName | ||
62 | + FROM | ||
63 | + 3m_student_meeting 3sm | ||
64 | + LEFT JOIN 3m_user 3u ON 3u.id = 3sm.student_id | ||
65 | + LEFT JOIN 3m_meeting 3meet ON 3meet.id = 3sm.meeting_id | ||
66 | + WHERE | ||
67 | + 3meet.create_user = '` +teacherName+"'";; | ||
68 | + querySql += ' ORDER BY 3sm.create_time DESC LIMIT '+(page-1)*pageno+' , ' +pageno | ||
69 | + let sm = await sequelize.query(querySql); | ||
70 | + return sm[0]; | ||
71 | + } catch (error) { | ||
72 | + console.log(error) | ||
73 | + throw error; | ||
74 | + } | ||
75 | +} | ||
76 | + | ||
56 | module.exports = new sutudentMeetingService(); | 77 | module.exports = new sutudentMeetingService(); |
-
请 注册 或 登录 后发表评论