Merge branch 'cygx_9.1' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity.go

@@ -69,7 +69,7 @@ func (this *ActivityCoAntroller) List() {
 // @Param   PlayBack   query   int  false       "是否仅展示回放 1：是、0：否 默认0"
 // @Param   KeyWord   query   string  false       "搜索关键词 多个用 , 隔开"
 // @Success 200 {object} models.GetCygxActivityListRep
-// @router /list [get]
+// @router /list_del_test [get]
 func (this *ActivityCoAntroller) ActivityList() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
@@ -4834,21 +4834,6 @@ func (this *ActivityCoAntroller) OverActivityList() {
 	if len(chartPermissionIds) > 0 {
 		condition += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `)`
 	}
-	//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_id IN (` + typeName + `)`
-	//}
 
 	conditionActivity, err := services.GetActivityonditionList(user, typeName, chartPermissionIds, whichDay, "3", "", 0, 0, "", 0, 1)
 	if err != nil && err.Error() != utils.ErrNoRow() {

services/activity_special.go

@@ -532,12 +532,52 @@ func GetActivitySpecialSearcheList(user *models.WxUserItem, condition string, st
 		err = errors.New("GetActivitySpecialSearcheList, Err: " + e.Error())
 		return
 	}
+
+	conditionActivityIk, e := GetActivityonditionList(user, "", "", "", "", "", 0, 1, keywords, 0, 2)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		err = errors.New("GetActivityonditionList, Err: " + e.Error())
+		return
+	}
+	conditionActivityIk += " AND art.is_limit_people = 1 AND art.publish_status = 1  "
+
+	totalIk, e := models.GetActivityCount(conditionActivityIk, 0, pars, 0)
+	if e != nil {
+		err = errors.New("GetActivityonditionList, Err: " + e.Error())
+		return
+	}
+	total = totalSearche + totalIk
+	keyWordArr, e := GetIndustryMapNameSliceV3(keywords)
+	if e != nil {
+		err = errors.New("GetActivityonditionList, Err: " + e.Error())
+		return
+	}
+	keyWordArr = RemoveDuplicatesAndEmpty(keyWordArr)
+
+	startSizeIk := startSize - total
+	if startSizeIk < 0 {
+		startSizeIk = 0
+	}
+	var pageSizeIk int
+	pageSizeIk = pageSize - len(list)
+	if pageSizeIk > 0 {
+		//搜索关键词联想
+		conditionActivityIk += ` ORDER BY art.activity_time DESC ,  art.active_state ASC   `
+		listIk, e := models.GetActivityListNew(conditionActivityIk, pars, user.UserId, startSizeIk, pageSizeIk, 0, 0, "")
+		if e != nil {
+			err = errors.New("GetActivityonditionList, Err: " + e.Error())
+			return
+		}
+		for _, item := range listIk {
+			list = append(list, item)
+		}
+	}
+
 	items, e = HandleActivityListButton(list, user)
 	if e != nil {
 		err = errors.New("HandleActivityListButton, Err: " + e.Error())
 		return
 	}
-	total = totalSearche
+
 	return
 }