付智勇

sh删除收藏

@@ -18,7 +18,7 @@ studentMeetingController.prototype.addStudentMeeting = async(ctx, next)=>{ @@ -18,7 +18,7 @@ studentMeetingController.prototype.addStudentMeeting = async(ctx, next)=>{
18 try { 18 try {
19 var body = ctx.request.body; 19 var body = ctx.request.body;
20 if(!body.studentId){ 20 if(!body.studentId){
21 - return status.paramError(' studentId'); 21 + return status.paramError('studentId');
22 }else if(!body.meetingId){ 22 }else if(!body.meetingId){
23 return status.paramError('meetingId'); 23 return status.paramError('meetingId');
24 } 24 }
@@ -88,12 +88,25 @@ studentMeetingController.prototype.updateStudentMeetingBySite = async(ctx, next) @@ -88,12 +88,25 @@ studentMeetingController.prototype.updateStudentMeetingBySite = async(ctx, next)
88 } 88 }
89 } 89 }
90 90
  91 +studentMeetingController.prototype.delStudentMeetingBySite = async(ctx, next)=>{
  92 + try {
  93 + let id = ctx.params.id;
  94 + let siteId = ctx.params.siteId;
  95 + let student = await studentMeetingService.delStudentMeetingBySite(id,siteId);
  96 + return student;
  97 + } catch (error) {
  98 + console.log(error)
  99 + throw error
  100 + }
  101 +}
  102 +
91 studentMeetingController.prototype.getStudentMeetingByStudentId = async(ctx, next)=>{ 103 studentMeetingController.prototype.getStudentMeetingByStudentId = async(ctx, next)=>{
92 try { 104 try {
93 let Id = ctx.params.id; 105 let Id = ctx.params.id;
  106 + var body = ctx.request.body;
94 let page = ctx.header.page ? Number(ctx.header.page):ctx.header.page; 107 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; 108 let pageno = ctx.header.pageno ? Number(ctx.header.pageno):ctx.header.pageno;
96 - let student = await studentMeetingService.getStudentMeetingByStudentId(Id,page,pageno); 109 + let student = await studentMeetingService.getStudentMeetingByStudentId(Id,page,pageno,body);
97 return student; 110 return student;
98 } catch (error) { 111 } catch (error) {
99 throw error; 112 throw error;
@@ -12,6 +12,11 @@ var attachment = sequelize.define('3m_attachment', { @@ -12,6 +12,11 @@ var attachment = sequelize.define('3m_attachment', {
12 primaryKey: true, 12 primaryKey: true,
13 field: "id" 13 field: "id"
14 }, 14 },
  15 + siteId: {
  16 + allowNull: false,
  17 + type: Sequelize.STRING(32),
  18 + field: "site_id"
  19 + },
15 businessId: { 20 businessId: {
16 allowNull: false, 21 allowNull: false,
17 type: Sequelize.STRING(32), 22 type: Sequelize.STRING(32),
@@ -84,7 +84,7 @@ router.get('/getStudentMeetingBySite/:siteId',async (ctx, next) => { @@ -84,7 +84,7 @@ router.get('/getStudentMeetingBySite/:siteId',async (ctx, next) => {
84 /** 84 /**
85 * 查询学生预约课程 85 * 查询学生预约课程
86 */ 86 */
87 -router.get('/getStudentMeetingByStudentId/:id',async (ctx, next) => { 87 +router.post('/getStudentMeetingByStudentId/:id',async (ctx, next) => {
88 try{ 88 try{
89 var data = await studentMeetingController.getStudentMeetingByStudentId(ctx, next); 89 var data = await studentMeetingController.getStudentMeetingByStudentId(ctx, next);
90 status.successTemp(ctx,200,data); 90 status.successTemp(ctx,200,data);
@@ -107,5 +107,18 @@ router.put('/updateStudentMeetingBySite/:id',async (ctx, next) => { @@ -107,5 +107,18 @@ router.put('/updateStudentMeetingBySite/:id',async (ctx, next) => {
107 } 107 }
108 }) 108 })
109 109
  110 +/**
  111 + * 删除收藏信息根据预约id
  112 + */
  113 +router.delete('/delStudentMeetingBySite/:id/:siteId',async (ctx, next) => {
  114 + try{
  115 + var data = await studentMeetingController.delStudentMeetingBySite(ctx, next);
  116 + status.successTemp(ctx,200,data);
  117 + }catch(e){
  118 + console.log(e)
  119 + status.catchError(ctx,400,e.message);
  120 + }
  121 +})
  122 +
110 123
111 module.exports = router; 124 module.exports = router;
@@ -113,7 +113,7 @@ studentMeetingService.prototype.delStudentMeetingBySite = async(id,siteId) =>{ @@ -113,7 +113,7 @@ studentMeetingService.prototype.delStudentMeetingBySite = async(id,siteId) =>{
113 } 113 }
114 } 114 }
115 115
116 -studentMeetingService.prototype.getStudentMeetingByStudentId = async(id,page=1,pageno=8) =>{ 116 +studentMeetingService.prototype.getStudentMeetingByStudentId = async(id,page=1,pageno=8,body) =>{
117 try { 117 try {
118 let querySql = `SELECT 118 let querySql = `SELECT
119 3u.*, 3meet.meeting_name, 119 3u.*, 3meet.meeting_name,
@@ -134,6 +134,9 @@ studentMeetingService.prototype.getStudentMeetingByStudentId = async(id,page=1,p @@ -134,6 +134,9 @@ studentMeetingService.prototype.getStudentMeetingByStudentId = async(id,page=1,p
134 LEFT JOIN 3m_meeting 3meet ON 3meet.id = 3sm.meeting_id 134 LEFT JOIN 3m_meeting 3meet ON 3meet.id = 3sm.meeting_id
135 WHERE 135 WHERE
136 3sm.student_id = '` +id+"'";; 136 3sm.student_id = '` +id+"'";;
  137 + if(body.status){
  138 + querySql += ' and 3sm.status = ' + body.status
  139 + }
137 140
138 querySql += ' AND 3sm.status != 5 ORDER BY 3sm.create_time DESC LIMIT '+(page-1)*pageno+' , ' +pageno 141 querySql += ' AND 3sm.status != 5 ORDER BY 3sm.create_time DESC LIMIT '+(page-1)*pageno+' , ' +pageno
139 let sm = await sequelize.query(querySql); 142 let sm = await sequelize.query(querySql);