From dbe1e3caddbb30c7797965a5f03bb426d53459fa Mon Sep 17 00:00:00 2001
From: 付智勇 <fuzhiyong@efangtec.com>
Date: Fri, 29 Sep 2017 11:25:45 +0800
Subject: [PATCH] sh删除收藏
---
controller/studentMeetingController.js | 17 +++++++++++++++--
model/attachmentModel.js | 5 +++++
routes/studentMeeting.js | 15 ++++++++++++++-
services/studentMeetingService.js | 5 ++++-
4 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/controller/studentMeetingController.js b/controller/studentMeetingController.js
index 75e2cfc..8b4f90e 100644
--- a/controller/studentMeetingController.js
+++ b/controller/studentMeetingController.js
@@ -18,7 +18,7 @@ studentMeetingController.prototype.addStudentMeeting = async(ctx, next)=>{
try {
var body = ctx.request.body;
if(!body.studentId){
- return status.paramError(' studentId');
+ return status.paramError('studentId');
}else if(!body.meetingId){
return status.paramError('meetingId');
}
@@ -88,12 +88,25 @@ studentMeetingController.prototype.updateStudentMeetingBySite = async(ctx, next)
}
}
+studentMeetingController.prototype.delStudentMeetingBySite = async(ctx, next)=>{
+ try {
+ let id = ctx.params.id;
+ let siteId = ctx.params.siteId;
+ let student = await studentMeetingService.delStudentMeetingBySite(id,siteId);
+ return student;
+ } catch (error) {
+ console.log(error)
+ throw error
+ }
+}
+
studentMeetingController.prototype.getStudentMeetingByStudentId = async(ctx, next)=>{
try {
let Id = ctx.params.id;
+ var body = ctx.request.body;
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.getStudentMeetingByStudentId(Id,page,pageno);
+ let student = await studentMeetingService.getStudentMeetingByStudentId(Id,page,pageno,body);
return student;
} catch (error) {
throw error;
diff --git a/model/attachmentModel.js b/model/attachmentModel.js
index a027ba5..71c2fff 100644
--- a/model/attachmentModel.js
+++ b/model/attachmentModel.js
@@ -12,6 +12,11 @@ var attachment = sequelize.define('3m_attachment', {
primaryKey: true,
field: "id"
},
+ siteId: {
+ allowNull: false,
+ type: Sequelize.STRING(32),
+ field: "site_id"
+ },
businessId: {
allowNull: false,
type: Sequelize.STRING(32),
diff --git a/routes/studentMeeting.js b/routes/studentMeeting.js
index 175dc4a..53b6e29 100644
--- a/routes/studentMeeting.js
+++ b/routes/studentMeeting.js
@@ -84,7 +84,7 @@ router.get('/getStudentMeetingBySite/:siteId',async (ctx, next) => {
/**
* 查询学生预约课程
*/
-router.get('/getStudentMeetingByStudentId/:id',async (ctx, next) => {
+router.post('/getStudentMeetingByStudentId/:id',async (ctx, next) => {
try{
var data = await studentMeetingController.getStudentMeetingByStudentId(ctx, next);
status.successTemp(ctx,200,data);
@@ -107,5 +107,18 @@ router.put('/updateStudentMeetingBySite/:id',async (ctx, next) => {
}
})
+/**
+ * 删除收藏信息根据预约id
+ */
+router.delete('/delStudentMeetingBySite/:id/:siteId',async (ctx, next) => {
+ try{
+ var data = await studentMeetingController.delStudentMeetingBySite(ctx, next);
+ status.successTemp(ctx,200,data);
+ }catch(e){
+ console.log(e)
+ status.catchError(ctx,400,e.message);
+ }
+})
+
module.exports = router;
\ No newline at end of file
diff --git a/services/studentMeetingService.js b/services/studentMeetingService.js
index 8d63eb0..3e2510b 100644
--- a/services/studentMeetingService.js
+++ b/services/studentMeetingService.js
@@ -113,7 +113,7 @@ studentMeetingService.prototype.delStudentMeetingBySite = async(id,siteId) =>{
}
}
-studentMeetingService.prototype.getStudentMeetingByStudentId = async(id,page=1,pageno=8) =>{
+studentMeetingService.prototype.getStudentMeetingByStudentId = async(id,page=1,pageno=8,body) =>{
try {
let querySql = `SELECT
3u.*, 3meet.meeting_name,
@@ -134,6 +134,9 @@ studentMeetingService.prototype.getStudentMeetingByStudentId = async(id,page=1,p
LEFT JOIN 3m_meeting 3meet ON 3meet.id = 3sm.meeting_id
WHERE
3sm.student_id = '` +id+"'";;
+ if(body.status){
+ querySql += ' and 3sm.status = ' + body.status
+ }
querySql += ' AND 3sm.status != 5 ORDER BY 3sm.create_time DESC LIMIT '+(page-1)*pageno+' , ' +pageno
let sm = await sequelize.query(querySql);
--
libgit2 0.24.0