专项调研活动已结束的默认不展示v2

controllers/activity.go

@@ -1890,7 +1890,7 @@ func (this *ActivityController) ScheduleList() {
 			//list[k].ImgUrlText = "https://hongze.oss-cn-shanghai.aliyuncs.com/static/images/202112/20211221/bIdfv8t86xrFRpDOeGGHXOmKEuKl.png"
 			list[k].ImgUrlText = utils.YAN_XUAN_IMG
 		}
-		if v.ActivityType == 0 && v.SourceType == 1{
+		if v.ActivityType == 0 && v.SourceType == 1 {
 			if mapAddress[v.City] != "" {
 				list[k].ImgUrl = mapAddress[v.City]
 			} else {
@@ -1958,4 +1958,4 @@ func (this *ActivityController) ScheduleList() {
 	br.Success = true
 	br.Msg = "获取成功"
 	br.Data = resp
-}
+}

services/activity_special.go

@@ -66,10 +66,6 @@ func ActivityLabelSpecialSql(chartPermissionIds, whichDay, activeState string) (
 		condition += ` AND art.days > 0  AND art.activity_time_end <= ` + "'" + time.Now().Format(utils.FormatDateTime) + " '"
 	}
 
-	if activeState == "1" {
-		condition += `  AND art.activity_time_end <= ` + "'" + time.Now().Format(utils.FormatDateTime) + " '"
-	}
-
 	//if activeState == "" && whichDay == "" {
 	//	condition += ` AND art.activity_time_end > ` + "'" + time.Now().Format(utils.FormatDateTime) + " '"
 	//}
@@ -134,6 +130,7 @@ func GetActivityLabelSpecialList(user *models.WxUserItem, conditionActivitySpeci
 	//	condition += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `) `
 	//}
 	conditionTrip := condition
+	conditionTrip += ` AND art.activity_time_end > ` + "'" + time.Now().Format(utils.FormatDateTime) + " '"
 	conditionTrip += ` AND art.days > 0  ORDER BY art.activity_time ASC `
 	specialList, err := models.GetActivityLabelSpecialListAll(conditionTrip, pars, 0, 8)
 	if err != nil {