fix

models/roadshow/calendar.go

@@ -96,7 +96,7 @@ type RsCalendar struct {
 
 func GetRsCalendarById(rsCalendarId int) (item *RsCalendar, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM rs_calendar WHERE rs_calendar_id=? `
+	sql := `SELECT * FROM rs_calendar WHERE rs_calendar_id=? AND b.status in (1,2) `
 	err = o.Raw(sql, rsCalendarId).QueryRow(&item)
 	return
 }
@@ -106,4 +106,4 @@ func GetRsCalendarResearcherById(rsCalendarId int) (item *RsCalendarResearcher,
 	o := orm.NewOrm()
 	err = o.Raw(sql, rsCalendarId).QueryRow(&item)
 	return
-}
+}

models/roadshow/public_meeting.go

@@ -19,7 +19,7 @@ func GetPublicMeetingList(endDate string) (list []*PublicMeetingView, err error)
 	sql := ` SELECT a.rs_calendar_id,min(DATE_FORMAT(CONCAT(b.start_date," ",b.start_time),'%Y-%m-%d %H:%i:%S')) AS min_time,max(DATE_FORMAT(CONCAT(b.end_date," ",b.end_time),'%Y-%m-%d %H:%i:%S')) AS max_time
 			FROM rs_calendar AS a
 			INNER JOIN rs_calendar_researcher AS b ON a.rs_calendar_id=b.rs_calendar_id
-			WHERE a.source=0 AND activity_type='公开会议'
+			WHERE a.source=0 AND activity_type='公开会议' AND b.status in (1,2)
 			AND b.end_date>=?
 			group by a.rs_calendar_id  `
 	o := orm.NewOrm()
@@ -62,7 +62,7 @@ func GetCoincideMeetingMinAndMaxTime(startTime, endTime string) (min_time, max_t
 			SELECT a.rs_calendar_id,MIN(DATE_FORMAT(CONCAT(b.start_date," ",b.start_time),'%Y-%m-%d %H:%i:%S')) AS min_time,MAX(DATE_FORMAT(CONCAT(b.end_date," ",b.end_time),'%Y-%m-%d %H:%i:%S')) AS max_time
 						FROM rs_calendar AS a
 						INNER JOIN rs_calendar_researcher AS b ON a.rs_calendar_id=b.rs_calendar_id
-						WHERE a.source=0 AND activity_type='公开会议'
+						WHERE a.source=0 AND activity_type='公开会议' AND b.status in (1,2) 
 						GROUP BY a.rs_calendar_id
 			)as t
 			where (t.min_time<=? AND t.max_time>=?) OR (?>=t.min_time AND ?<=t.max_time) `