From 4a92ab099c4258e3aa4d1594d100a687d3ac5bb7 Mon Sep 17 00:00:00 2001
From: 付智勇 <fuzhiyong@efangtec.com>
Date: Fri, 29 Sep 2017 09:16:44 +0800
Subject: [PATCH] no message
---
controller/studentMeetingController.js | 11 +++++++++++
routes/studentMeeting.js | 13 +++++++++++++
services/studentMeetingService.js | 57 +++++++++++++++++++++++++++++++++++----------------------
3 files changed, 59 insertions(+), 22 deletions(-)
diff --git a/controller/studentMeetingController.js b/controller/studentMeetingController.js
index 013106c..75e2cfc 100644
--- a/controller/studentMeetingController.js
+++ b/controller/studentMeetingController.js
@@ -100,4 +100,15 @@ studentMeetingController.prototype.getStudentMeetingByStudentId = async(ctx, nex
}
}
+studentMeetingController.prototype.isAppointment = async(ctx, next)=>{
+ try {
+ var body = ctx.request.body;
+ let Appointment = await studentMeetingService.isAppointment(body);
+ return Appointment;
+ } catch (error) {
+ console.log(error)
+ throw error
+ }
+}
+
module.exports = new studentMeetingController();
\ No newline at end of file
diff --git a/routes/studentMeeting.js b/routes/studentMeeting.js
index c07f569..175dc4a 100644
--- a/routes/studentMeeting.js
+++ b/routes/studentMeeting.js
@@ -57,6 +57,19 @@ router.get('/queryStudentMeeting/:teacherName',async (ctx, next) => {
})
/**
+ * 根据查询老师的预约
+ */
+router.post('/isAppointment',async (ctx, next) => {
+ try{
+ var data = await studentMeetingController.isAppointment(ctx, next);
+ status.successTemp(ctx,200,data);
+ }catch(e){
+ console.log(e)
+ status.catchError(ctx,400,e.message);
+ }
+})
+
+/**
* 查询站点的预约课程
*/
router.get('/getStudentMeetingBySite/:siteId',async (ctx, next) => {
diff --git a/services/studentMeetingService.js b/services/studentMeetingService.js
index 30ef6aa..8df1539 100644
--- a/services/studentMeetingService.js
+++ b/services/studentMeetingService.js
@@ -100,29 +100,42 @@ studentMeetingService.prototype.updateStudentMeetingBySite = async(id,data) =>{
}
studentMeetingService.prototype.getStudentMeetingByStudentId = async(id,page=1,pageno=8) =>{
- let querySql = `SELECT
- 3u.*, 3meet.meeting_name,
- 3meet.meeting_status meetingStatus,
- 3meet.id meetingId,
- 3meet.create_user teacherName,
- 3meet.meeting_number meetingNumber,
- 3meet.begin_time meetingBeginTime,
- 3meet.end_time meetingEndTime,
- 3sm. STATUS studentMeetingStatus,
- 3u2.user_name checkUserName,
- 3sm.check_time check_time,
- 3sm.id studentMeetingId
- FROM
- 3m_student_meeting 3sm
- LEFT JOIN 3m_user 3u ON 3u.id = 3sm.student_id
- LEFT JOIN 3m_user 3u2 ON 3u2.id = 3sm.check_user_id
- LEFT JOIN 3m_meeting 3meet ON 3meet.id = 3sm.meeting_id
- WHERE
- 3sm.student_id = '` +id+"'";;
+ try {
+ let querySql = `SELECT
+ 3u.*, 3meet.meeting_name,
+ 3meet.meeting_status meetingStatus,
+ 3meet.id meetingId,
+ 3meet.create_user teacherName,
+ 3meet.meeting_number meetingNumber,
+ 3meet.begin_time meetingBeginTime,
+ 3meet.end_time meetingEndTime,
+ 3sm. STATUS studentMeetingStatus,
+ 3u2.user_name checkUserName,
+ 3sm.check_time check_time,
+ 3sm.id studentMeetingId
+ FROM
+ 3m_student_meeting 3sm
+ LEFT JOIN 3m_user 3u ON 3u.id = 3sm.student_id
+ LEFT JOIN 3m_user 3u2 ON 3u2.id = 3sm.check_user_id
+ LEFT JOIN 3m_meeting 3meet ON 3meet.id = 3sm.meeting_id
+ WHERE
+ 3sm.student_id = '` +id+"'";;
-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];
+ 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];
+ } catch (error) {
+ throw error
+ }
+}
+
+studentMeetingService.prototype.isAppointment = async(body)=>{
+ try {
+ let Appointment = await studentMeeting.findAll({where:body});
+ return Appointment;
+ } catch (error) {
+ throw error;
+ }
}
module.exports = new studentMeetingService();
\ No newline at end of file
--
libgit2 0.24.0