活动1328手动合并三条路演信息

models/activity.go

@@ -122,7 +122,7 @@ func GetAddActivityInfoById(ActivityId int) (item *ActivityDetail, err error) {
 //通过活动名称获取活动详情
 func GetAddActivityInfoByTitle(title, startDate, endDate string) (item *ActivityDetail, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM cygx_activity  WHERE  activity_time > '` + startDate + `' AND activity_time < '` + endDate + `' AND (activity_name_task LIKE '%` + title + `%' OR  jmcj_roadshow_title LIKE '%` + title + `%') LIMIT 1 `
+	sql := `SELECT * FROM cygx_activity  WHERE  activity_time > '` + startDate + `' AND activity_time < '` + endDate + `' AND (activity_name_task LIKE '%` + title + `%' OR  jmcj_roadshow_title LIKE '%` + title + `%')   AND activity_id  NOT IN (1328)  LIMIT 1 `
 	err = o.Raw(sql).QueryRow(&item)
 	return
 }
@@ -201,7 +201,7 @@ func GetActivityListByDateTime(startDate, endDate, activityIds, activityIdsLongT
 	sql := `SELECT * FROM cygx_activity WHERE activity_time > '` + startDate + `' AND activity_time < '` + endDate + `' `
 	activityIds = strings.TrimRight(activityIds, ",")
 	if activityIds != "" {
-		sql += ` AND activity_id  NOT IN (` + activityIds + `) `
+		sql += ` AND activity_id  NOT IN (` + activityIds + `,1328 )  `
 	}
 	sql += `  OR activity_id IN (` + activityIdsLongTime + `)`
 	_, err = o.Raw(sql).QueryRows(&items)