Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
付智勇
/
koa2_Sequelize_project
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
付智勇
8 years ago
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
dbe1e3caddbb30c7797965a5f03bb426d53459fa
dbe1e3ca
1 parent
11121103
master
...
20171113
nows
revert-2a1f6481
sh删除收藏
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
38 行增加
和
4 行删除
controller/studentMeetingController.js
model/attachmentModel.js
routes/studentMeeting.js
services/studentMeetingService.js
controller/studentMeetingController.js
查看文件 @
dbe1e3c
...
...
@@ -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
;
...
...
model/attachmentModel.js
查看文件 @
dbe1e3c
...
...
@@ -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
),
...
...
routes/studentMeeting.js
查看文件 @
dbe1e3c
...
...
@@ -84,7 +84,7 @@ router.get('/getStudentMeetingBySite/:siteId',async (ctx, next) => {
/**
* 查询学生预约课程
*/
router
.
ge
t
(
'/getStudentMeetingByStudentId/:id'
,
async
(
ctx
,
next
)
=>
{
router
.
pos
t
(
'/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
...
...
services/studentMeetingService.js
查看文件 @
dbe1e3c
...
...
@@ -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
3
sm
.
status
=
' + body.status
}
querySql += '
AND
3
sm
.
status
!=
5
ORDER
BY
3
sm
.
create_time
DESC
LIMIT
'+(page-1)*pageno+'
,
'
+
pageno
let
sm
=
await
sequelize
.
query
(
querySql
);
...
...
请
注册
或
登录
后发表评论