|
@@ -372,9 +372,9 @@ func GetMicroRoadShowPageListV8(pageSize, currentIndex, audioId, videoId, activi
|
|
|
// 活动已发布且已结束
|
|
|
audioCond += ` AND b.publish_status = 1 AND b.active_state = 3`
|
|
|
//活动音频,设置有效时间为30天,失效后该活动就不再支持音频回放。有效期起始时间为活动的开始时间
|
|
|
- endTime := time.Now().AddDate(0, 0, -30).Format("2006-01-02 15:04:05")
|
|
|
- audioCond += ` AND b.activity_time > ? `
|
|
|
- audioPars = append(audioPars, endTime)
|
|
|
+ //endTime := time.Now().AddDate(0, 0, -30).Format("2006-01-02 15:04:05")
|
|
|
+ //audioCond += ` AND b.activity_time > ? `
|
|
|
+ //audioPars = append(audioPars, endTime)
|
|
|
if keywords != "" {
|
|
|
audioCond += ` AND a.voice_name LIKE ? OR b.label LIKE ?`
|
|
|
audioPars = append(audioPars, keywords, keywords)
|
|
@@ -414,11 +414,11 @@ func GetMicroRoadShowPageListV8(pageSize, currentIndex, audioId, videoId, activi
|
|
|
if activityVideoId > 0 {
|
|
|
videoCond += ` AND video_id = 0 `
|
|
|
}
|
|
|
- if videoId == 0 {
|
|
|
- endTime := time.Now().AddDate(0, 0, -30).Format("2006-01-02 15:04:05")
|
|
|
- videoCondAct += ` AND art.activity_time > ? `
|
|
|
- videoParsAct = append(videoParsAct, endTime)
|
|
|
- }
|
|
|
+ //if videoId == 0 {
|
|
|
+ // endTime := time.Now().AddDate(0, 0, -30).Format("2006-01-02 15:04:05")
|
|
|
+ // videoCondAct += ` AND art.activity_time > ? `
|
|
|
+ // videoParsAct = append(videoParsAct, endTime)
|
|
|
+ //}
|
|
|
videoCond += ` AND publish_status = 1`
|
|
|
}
|
|
|
total, videoList, e = models.GetMicroRoadShowVideoPageListV8(startSize, pageSize, videoCond, videoPars, videoCondAct, videoParsAct, audioCond, audioPars, audioId, videoId, activityVideoId)
|