Merge branch 'cygx_8.7' into debug

controllers/activity.go

@@ -2461,6 +2461,7 @@ func (this *ActivityCoAntroller) LabelMoreList() {
 // @Param   KeyWord   query   string  false       "搜索关键词 多个用 , 隔开"
 // @Param   ActivityId   query   int  false       "活动列表传过来的活动ID"
 // @Param   Filter			query	int		false	"筛选条件 0:全部 1:视频 2:音频"
+// @Param   TypeName   query   string  false       "电话会类型 ，1专家电话会 2分析师电话会"
 // @Success 200 {object} models.GetCygxActivityListRep
 // @router /listNew [get]
 func (this *ActivityCoAntroller) ActivityListNew() {
@@ -2487,6 +2488,7 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 	keyWord := this.GetString("KeyWord")
 	playBack, _ := this.GetInt("PlayBack")
 	filter, _ := this.GetInt("Filter")
+	typeName := this.GetString("TypeName")
 	activityId, _ := this.GetInt("ActivityId") // 仅用于判断【新】标签
 
 	if label == "undefined" {
@@ -2593,6 +2595,23 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 	}
 
 	condition += conditionOrder
+
+	if typeName != ""{
+		typeSlice := strings.Split(typeName, ",")
+		tempCondition := ""
+		for _, s := range typeSlice {
+			if s == "1"{
+				tempCondition += "'专家电话会',"
+			} else if s == "2" {
+				tempCondition += "'分析师电话会',"
+			} else if s == "1,2" {
+				tempCondition += "'专家电话会','分析师电话会',"
+			}
+		}
+		tempCondition = strings.TrimRight(tempCondition, ",")
+		condition += ` AND art.activity_type_name IN (` + tempCondition + `)`
+	}
+
 	list, errList := models.GetActivityListNew(condition, pars, uid, startSize, pageSize, playBack, filter)
 	if errList != nil {
 		br.Msg = "获取失败"
@@ -4836,6 +4855,8 @@ func (this *ActivityCoAntroller) OverActivityList() {
 				tempCondition += "'专家电话会',"
 			} else if s == "2" {
 				tempCondition += "'分析师电话会',"
+			} else if s == "1,2" {
+				tempCondition += "'专家电话会','分析师电话会',"
 			}
 		}
 		tempCondition = strings.TrimRight(tempCondition, ",")