|
|
@@ -319,7 +319,7 @@ func GetCalendarListCount(condition string, pars []interface{}, calendarType int
|
|
|
func GetCalendarList(condition string, pars []interface{}, startSize, pageSize, calendarType int) (list []*CalendarListView, err error) {
|
|
|
o := orm.NewOrm()
|
|
|
if calendarType == 3 || calendarType == 4 {
|
|
|
- sql := ` SELECT a.rs_calendar_id,a.activity_type,a.roadshow_type,a.activity_category,a.roadshow_platform,b.create_time,
|
|
|
+ sql := ` SELECT a.rs_calendar_id,a.activity_type,a.roadshow_type,a.activity_category,a.roadshow_platform,b.create_time,a.district,
|
|
|
b.modify_time,GROUP_CONCAT(b.researcher_id ORDER BY researcher_sort ASC) AS researcher_id,GROUP_CONCAT(b.researcher_name ORDER BY researcher_sort ASC) AS researcher_name,
|
|
|
b.rs_calendar_researcher_id,b.start_date,
|
|
|
b.end_date,b.start_time,b.end_time,b.start_week,b.end_week,b.status,b.refuse_reason,b.refuse_time,
|
zwxi