活动搜索

controllers/activity.go

@@ -2776,6 +2776,7 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 	var condition string
 	var pars []interface{}
 	//活动可见限制
+
 	conditionActivity, err := services.GetActivityonditionList(user, activityTypeId, chartPermissionIds, whichDay, activeState, label, 0, source, keyWord)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "获取失败"

models/activity_voice.go

@@ -21,7 +21,7 @@ type CygxActivityVoiceReq struct {
 	ActivityId  int    ` description:"活动ID"`
 	Url         string `description:"音频资源url地址"`
 	Name        string `description:"音频名称"`
-	PlaySeconds string `description:"音频时长"`
+	PlaySeconds int    `description:"音频时长"`
 }
 
 // GetCygxActivityVoiceReqList 获取活动ID的音频

services/activity.go

@@ -429,7 +429,7 @@ func GetHavePower(activityInfo *models.ActivityDetail, permissionStr, companyDet
 // @Param   Label   query   string  false       "搜索主题 多个用 , 隔开"
 // @Param   PlayBack   query   int  false       "是否仅展示回放 1：是、0：否 默认0"
 // @Param   KeyWord   query   string  false       "搜索关键词 多个用 , 隔开"
-func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermissionIds, whichDay, activeState, label string, isPower, source int, KeyWord string) (conditionActivity string, err error) {
+func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermissionIds, whichDay, activeState, label string, isPower, source int, keyWord string) (conditionActivity string, err error) {
 	adminIds, err := models.GetSelleridWhichGroup(user.CompanyId, 2)
 	if err != nil {
 		return
@@ -500,6 +500,7 @@ func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermi
 	if source == 1 {
 		condition += ` AND art.yidong_activity_id = '' `
 	}
+
 	var conditionOr string
 	if whichDay != "" {
 		var startDate string
@@ -517,17 +518,23 @@ func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermi
 		condition += ` AND art.activity_time >= ` + "'" + startDate + " 00:00:00'"
 		condition += ` AND art.activity_time <= ` + "'" + endDate + " 23:59:59'"
 	}
-	if activeState != "" {
-		// 默认查看未开始跟进行中
-		if activeState == "1" {
-			condition += ` AND art.active_state  IN (1,2)`
+
+	//有搜索条件传过来时，不判进行状态条件
+	if keyWord != "" {
+		condition += ` AND (art.label  LIKE '%` + keyWord + `%' OR art.activity_name  LIKE '%` + keyWord + `%' ) `
+	} else {
+		if activeState != "" {
+			// 默认查看未开始跟进行中
+			if activeState == "1" {
+				condition += ` AND art.active_state  IN (1,2)`
+			} else {
+				condition += ` AND art.active_state  IN (` + activeState + `)`
+			}
 		} else {
-			condition += ` AND art.active_state  IN (` + activeState + `)`
+			condition += ` AND art.active_state  IN (1,2)`
 		}
-	} else {
-		condition += ` AND art.active_state  IN (1,2)`
 	}
-	conditionAdmin = condition
+
 	//查询全部可见的数据（是否全部客户可见）
 	condition += ` AND art.visible_range != 1  AND art.publish_status = 1 `
 
@@ -1392,7 +1399,6 @@ func GetActivityVoiceResp(mapActivityId []int) (mapItem map[int]*models.CygxActi
 	mapActivityVoice := make(map[int]*models.CygxActivityVoiceReq)
 	if len(activityVoiceList) > 0 {
 		for _, v := range activityVoiceList {
-			v.PlaySeconds = utils.Mp3Time(v.PlaySeconds)
 			mapActivityVoice[v.ActivityId] = v
 		}
 	}