xingzai 2 жил өмнө
parent
commit
86a6aa3d4e

+ 3 - 3
models/activity_voice.go

@@ -33,7 +33,7 @@ func GetCygxActivityVoiceReqList(activityIds []int) (items []*CygxActivityVoiceR
 		return
 		return
 	}
 	}
 	//活动音频,设置有效时间为30天,失效后该活动就不再支持音频回放。有效期起始时间为活动的开始时间
 	//活动音频,设置有效时间为30天,失效后该活动就不再支持音频回放。有效期起始时间为活动的开始时间
-	endTime := time.Now().AddDate(0, 0, -30).Format("2006-01-02 15:04:05")
+	//endTime := time.Now().AddDate(0, 0, -30).Format("2006-01-02 15:04:05")
 	sql := `SELECT
 	sql := `SELECT
 			v.activity_id,
 			v.activity_id,
 			v.voice_url AS url,
 			v.voice_url AS url,
@@ -43,9 +43,9 @@ func GetCygxActivityVoiceReqList(activityIds []int) (items []*CygxActivityVoiceR
 			cygx_activity_voice AS v
 			cygx_activity_voice AS v
 			INNER JOIN cygx_activity AS a ON a.activity_id = v.activity_id 
 			INNER JOIN cygx_activity AS a ON a.activity_id = v.activity_id 
 		WHERE
 		WHERE
-			1 = 1 	AND a.activity_time > ? AND  v.activity_id IN (` + utils.GetOrmInReplace(lenactivityIds) + `)  `
+			1 = 1 	 AND  v.activity_id IN (` + utils.GetOrmInReplace(lenactivityIds) + `)  `
 	o := orm.NewOrm()
 	o := orm.NewOrm()
-	_, err = o.Raw(sql, endTime, activityIds).QueryRows(&items)
+	_, err = o.Raw(sql, activityIds).QueryRows(&items)
 	return
 	return
 }
 }
 
 

+ 1 - 1
models/tactics.go

@@ -112,8 +112,8 @@ func GetTacticsListAll2() (list []*Tactics2, err error) {
 
 
 type TacticsListResp struct {
 type TacticsListResp struct {
 	Paging            *paging.PagingItem
 	Paging            *paging.PagingItem
-	ChartPermissionId int    `description:"行业Id"`
 	MatchTypeName     string `description:"匹配类型"`
 	MatchTypeName     string `description:"匹配类型"`
+	ChartPermissionId int    `description:"行业ID"`
 	CategoryImgUrlPc  string `description:"图片"`
 	CategoryImgUrlPc  string `description:"图片"`
 	List              []*ReportArticle
 	List              []*ReportArticle
 }
 }

+ 2 - 2
services/activity.go

@@ -634,8 +634,8 @@ func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermi
 		}
 		}
 
 
 		//活动音频,设置有效时间为30天,失效后该活动就不再支持音频回放。有效期起始时间为活动的开始时间
 		//活动音频,设置有效时间为30天,失效后该活动就不再支持音频回放。有效期起始时间为活动的开始时间
-		endTime := time.Now().AddDate(0, 0, -30).Format("2006-01-02 15:04:05")
-		condition += ` AND art.activity_time > '` + endTime + `'  `
+		//endTime := time.Now().AddDate(0, 0, -30).Format("2006-01-02 15:04:05")
+		//condition += ` AND art.activity_time > '` + endTime + `'  `
 		if len(ativityVIdArry) > 0 {
 		if len(ativityVIdArry) > 0 {
 			ativityVIdstr := strings.Join(ativityVIdArry, ",")
 			ativityVIdstr := strings.Join(ativityVIdArry, ",")
 			fmt.Println(ativityVIdstr)
 			fmt.Println(ativityVIdstr)

+ 8 - 8
services/micro_roadshow.go

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