|
|
@@ -23,7 +23,7 @@ type CalendarController struct {
|
|
|
// @Description 我的日历列表接口
|
|
|
// @Param PageSize query int true "每页数据条数"
|
|
|
// @Param CurrentIndex query int true "当前页页码，从1开始"
|
|
|
-// @Param Status query int true "1:待接受,2:已接受,3:已拒绝,4:已删除,5:已撤回"
|
|
|
+// @Param Status query int true "1:待接受,2:包含，已接受,已拒绝,已删除"
|
|
|
// @Success 200 {object} roadshow.CalendarListResp
|
|
|
// @router /calendar/list [get]
|
|
|
func (this *CalendarController) CalendarList() {
|
|
|
@@ -52,8 +52,12 @@ func (this *CalendarController) CalendarList() {
|
|
|
condition += ` AND b.researcher_id=?`
|
|
|
pars = append(pars, adminItem.AdminId)
|
|
|
|
|
|
- condition += ` AND b.status=?`
|
|
|
- pars = append(pars, status)
|
|
|
+ if status == 1 {
|
|
|
+ condition += ` AND b.status=?`
|
|
|
+ pars = append(pars, 1)
|
|
|
+ } else {
|
|
|
+ condition += ` AND b.status IN(2,3,4)`
|
|
|
+ }
|
|
|
|
|
|
resp := new(roadshow.CalendarListResp)
|
|
|
total, err := roadshow.GetCalendarListCount(condition, pars)
|
longyu