no message

controllers/micro_roadshow.go

@@ -44,12 +44,6 @@ func (this *MicroRoadShowController) List() {
 	pageSize, _ := this.GetInt("PageSize")
 	currentIndex, _ := this.GetInt("CurrentIndex")
 	keywords := this.GetString("KeyWord")
-	//audioId, _ := this.GetInt("AudioId")
-	//videoId, _ := this.GetInt("VideoId")
-	//audioIds := this.GetString("AudioIds")
-	//videoIds := this.GetString("VideoIds")
-	//activityVideoIds := this.GetString("ActivityVideoIds")
-	//activityVideoId, _ := this.GetInt("ActivityVideoId")
 	filter := this.GetString("Filter")
 	chartPermissionIds := this.GetString("ChartPermissionIds")
 	sourceId, _ := this.GetInt("SourceId")

services/cygx_activity_video_history.go

@@ -56,10 +56,16 @@ func AddActivityVideoHistory(user *models.WxUserItem, activityId, playSeconds in
 			go utils.SendAlarmMsg(fmt.Sprint("添加活动视频的播放记录失败 AddActivityVideoHistory Err:", err.Error(), "活动ID：", activityId, "UserId：", user.UserId), 2)
 		}
 	}()
+	activityVideoInfo, e := models.GetCygxActivityVideoByActivityId(activityId)
+	if e != nil {
+		err = errors.New("GetSellerByCompanyIdCheckFicc, Err: " + e.Error())
+		return
+	}
 	item := new(models.CygxActivityVideoHistory)
 	item.UserId = user.UserId
 	item.RealName = user.RealName
 	item.ActivityId = activityId
+	item.VideoId = activityVideoInfo.VideoId
 	item.PlaySeconds = strconv.Itoa(playSeconds)
 	item.Mobile = user.Mobile
 	item.Email = user.Email

services/micro_roadshow.go

@@ -343,8 +343,8 @@ func GetMicroRoadShowPageListV12(pageSize, currentIndex, sourceId, tableType int
 		// @Param   SearchType	string	int		true	"搜索类型: 1-路演回放; 2-问答系列； 3-调研反馈   多个用 , 隔开"
 		videoMico += ` AND a.chart_permission_id  = 0 ` // 产业视频不在搜索范围内
 		if !strings.Contains(searchType, "1") {
-			audioAct += ` AND b.activity_type_id != 2 `
-			videoAct += ` AND b.activity_type_id != 2 `
+			audioAct += ` AND b.activity_type_id NOT  IN (2,7) `
+			videoAct += ` AND b.activity_type_id NOT  IN (2,7)  `
 		}
 
 		if !strings.Contains(searchType, "2") {
@@ -352,8 +352,8 @@ func GetMicroRoadShowPageListV12(pageSize, currentIndex, sourceId, tableType int
 		}
 
 		if !strings.Contains(searchType, "3") {
-			audioAct += ` AND b.yidong_activity_id_by_cygx != '' `
-			videoAct += ` AND b.yidong_activity_id_by_cygx != '' `
+			audioAct += ` AND b.activity_type_id  IN (2,7)  AND b.yidong_activity_id_by_cygx != '' `
+			videoAct += ` AND b.activity_type_id  IN (2,7)  AND b.yidong_activity_id_by_cygx != '' `
 		}
 
 		if !strings.Contains(searchType, "3") && !strings.Contains(searchType, "1") {