微路演筛选

services/micro_roadshow.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"hongze/hongze_clpt/models"
 	"hongze/hongze_clpt/utils"
+	"strings"
 )
 
 // GetMicroRoadShowDefaultImgConfig 获取微路演默认图/分享图配置
@@ -251,13 +252,27 @@ func GetMicroRoadShowPageListV8(pageSize, currentIndex, audioId, videoId, activi
 		videoCondAct += ` AND video_id = 0 `
 		videoCond += ` AND video_id = 0 `
 	}
-	if filter == "1" {
+
+	if strings.Contains(filter, "1") && !strings.Contains(filter, "2") {
+		audioCond += ` AND a.activity_voice_id = 0 `
+	} else if !strings.Contains(filter, "1") && strings.Contains(filter, "2") {
+		videoCondAct += ` AND video_id = 0 `
+		videoCond += ` AND video_id = 0 `
+	}
+
+	if strings.Contains(filter, "3") && !strings.Contains(filter, "4") {
 		audioCond += ` AND a.activity_voice_id = 0 `
-	} else if filter == "2" {
 		videoCondAct += ` AND video_id = 0 `
+	} else if strings.Contains(filter, "3") && !strings.Contains(filter, "4") {
 		videoCond += ` AND video_id = 0 `
 	}
 
+	//if filter == "1" {
+	//	audioCond += ` AND a.activity_voice_id = 0 `
+	//} else if filter == "2" {
+	//	videoCondAct += ` AND video_id = 0 `
+	//	videoCond += ` AND video_id = 0 `
+	//}
 	videoCond += ` AND publish_status = 1`
 	total, videoList, e = models.GetMicroRoadShowVideoPageListV8(startSize, pageSize, videoCond, videoPars, videoCondAct, videoParsAct, audioCond, audioPars, audioId, videoId, activityVideoId, 0)
 	if e != nil {
@@ -362,12 +377,27 @@ func CountMicroRoadShowPageListIkWord(audioId, videoId, activityVideoId int, key
 		videoCondAct += ` AND video_id = 0 `
 		videoCond += ` AND video_id = 0 `
 	}
-	if filter == "1" {
+
+	if strings.Contains(filter, "1") && !strings.Contains(filter, "2") {
+		audioCond += ` AND a.activity_voice_id = 0 `
+	} else if !strings.Contains(filter, "1") && strings.Contains(filter, "2") {
+		videoCondAct += ` AND video_id = 0 `
+		videoCond += ` AND video_id = 0 `
+	}
+
+	if strings.Contains(filter, "3") && !strings.Contains(filter, "4") {
 		audioCond += ` AND a.activity_voice_id = 0 `
-	} else if filter == "2" {
 		videoCondAct += ` AND video_id = 0 `
+	} else if strings.Contains(filter, "3") && !strings.Contains(filter, "4") {
 		videoCond += ` AND video_id = 0 `
 	}
+	//
+	//if filter == "1" {
+	//	audioCond += ` AND a.activity_voice_id = 0 `
+	//} else if filter == "2" {
+	//	videoCondAct += ` AND video_id = 0 `
+	//	videoCond += ` AND video_id = 0 `
+	//}
 
 	videoCond += ` AND publish_status = 1`
 	//}
@@ -449,13 +479,28 @@ func GetMicroRoadShowPageListIkWord(startSize, pageSize, audioId, videoId, activ
 		videoCondAct += ` AND video_id = 0 `
 		videoCond += ` AND video_id = 0 `
 	}
-	if filter == "1" {
+
+	if strings.Contains(filter, "1") && !strings.Contains(filter, "2") {
 		audioCond += ` AND a.activity_voice_id = 0 `
-	} else if filter == "2" {
+	} else if !strings.Contains(filter, "1") && strings.Contains(filter, "2") {
 		videoCondAct += ` AND video_id = 0 `
 		videoCond += ` AND video_id = 0 `
 	}
 
+	if strings.Contains(filter, "3") && !strings.Contains(filter, "4") {
+		audioCond += ` AND a.activity_voice_id = 0 `
+		videoCondAct += ` AND video_id = 0 `
+	} else if strings.Contains(filter, "3") && !strings.Contains(filter, "4") {
+		videoCond += ` AND video_id = 0 `
+	}
+
+	//if filter == "1" {
+	//	audioCond += ` AND a.activity_voice_id = 0 `
+	//} else if filter == "2" {
+	//	videoCondAct += ` AND video_id = 0 `
+	//	videoCond += ` AND video_id = 0 `
+	//}
+
 	videoCond += ` AND publish_status = 1`
 	//}
 	videoList, e = models.GetMicroRoadShowVideoPageListIkWord(startSize, pageSize, videoCond, videoPars, videoCondAct, videoParsAct, audioCond, audioPars, audioId, videoId, activityVideoId, 0)