|
@@ -188,7 +188,7 @@ func GetMicroRoadshowVideoMap() (items map[int]int, err error) {
|
|
|
}
|
|
|
|
|
|
// GetMicroRoadShowPageList 获取微路演列表添加活动视频 更新与8.1版本
|
|
|
-func GetMicroRoadShowPageListV8(pageSize, currentIndex, audioId, videoId, activityVideoId int, filter, keywords, audioIds, videoIds, activityVideoIds string) (respList []*models.MicroRoadShowPageList, total int, err error) {
|
|
|
+func GetMicroRoadShowPageListV8(pageSize, currentIndex, audioId, videoId, activityVideoId int, filter, keywords string) (respList []*models.MicroRoadShowPageList, total int, err error) {
|
|
|
var e error
|
|
|
// 根据每页数据量获取音视频配比
|
|
|
startSize := utils.StartIndex(currentIndex, pageSize)
|
|
@@ -220,15 +220,6 @@ func GetMicroRoadShowPageListV8(pageSize, currentIndex, audioId, videoId, activi
|
|
|
audioCond += ` AND a.activity_voice_id = ?`
|
|
|
audioPars = append(audioPars, audioId)
|
|
|
}
|
|
|
- if audioIds != "" {
|
|
|
- sliceId := strings.Split(audioIds, ",")
|
|
|
- var idSqlStr string
|
|
|
- for _, v := range sliceId {
|
|
|
- idSqlStr += "'" + v + "',"
|
|
|
- }
|
|
|
- idSqlStr = strings.TrimRight(idSqlStr, ",")
|
|
|
- audioCond += ` AND a.activity_voice_id IN (` + idSqlStr + `)`
|
|
|
- }
|
|
|
}
|
|
|
//活动视频的处理
|
|
|
var videoCondAct string
|
|
@@ -244,15 +235,6 @@ func GetMicroRoadShowPageListV8(pageSize, currentIndex, audioId, videoId, activi
|
|
|
videoCondAct += ` AND video_id = ?`
|
|
|
videoParsAct = append(videoParsAct, activityVideoId)
|
|
|
}
|
|
|
- if activityVideoIds != "" {
|
|
|
- sliceId := strings.Split(activityVideoIds, ",")
|
|
|
- var idSqlStr string
|
|
|
- for _, v := range sliceId {
|
|
|
- idSqlStr += "'" + v + "',"
|
|
|
- }
|
|
|
- idSqlStr = strings.TrimRight(idSqlStr, ",")
|
|
|
- videoCondAct += ` AND v.video_id IN (` + idSqlStr + `)`
|
|
|
- }
|
|
|
videoCondAct += ` AND publish_status = 1`
|
|
|
}
|
|
|
//产业视频的处理
|
|
@@ -269,15 +251,7 @@ func GetMicroRoadShowPageListV8(pageSize, currentIndex, audioId, videoId, activi
|
|
|
videoCond += ` AND video_id = ?`
|
|
|
videoPars = append(videoPars, videoId)
|
|
|
}
|
|
|
- if videoIds != "" {
|
|
|
- sliceId := strings.Split(videoIds, ",")
|
|
|
- var idSqlStr string
|
|
|
- for _, v := range sliceId {
|
|
|
- idSqlStr += "'" + v + "',"
|
|
|
- }
|
|
|
- idSqlStr = strings.TrimRight(idSqlStr, ",")
|
|
|
- videoCond += ` AND video_id IN (` + idSqlStr + `)`
|
|
|
- }
|
|
|
+
|
|
|
videoCond += ` AND publish_status = 1`
|
|
|
}
|
|
|
total, videoList, e = models.GetMicroRoadShowVideoPageListV8(startSize, pageSize, videoCond, videoPars, videoCondAct, videoParsAct, audioCond, audioPars, audioId, videoId, activityVideoId, 0)
|