no message

controllers/activity.go

@@ -79,7 +79,9 @@ func (this *ActivityController) LabelTypeList() {
 	}
 	list, err = services.HandleActivityTypeHomeList(list, activityList, user)
 
-	speciaItem, err := services.GetActivityLabelSpecialList(user, chartPermissionIds)
+	conditionActivitySpecial := services.ActivityLabelSpecialSql(chartPermissionIds, whichDay, activeState)
+
+	speciaItem, err := services.GetActivityLabelSpecialList(user, conditionActivitySpecial)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()

services/activity.go

@@ -83,6 +83,7 @@ func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermi
 	//主题
 	if label != "" {
 		condition = ` AND art.label  LIKE '%` + label + `%' `
+
 	}
 
 	if isPower == 1 {
@@ -91,6 +92,7 @@ func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermi
 
 	//行业名称
 	if len(chartPermissionIds) > 0 {
+
 		condition += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `)`
 	}
 	//如果是PC的，则不看易董的
@@ -276,6 +278,7 @@ func HandleActivityTypeHomeList(listType []*models.ActivityTypeHome, listActivit
 			activityIds = append(activityIds, v.ActivityId)
 		}
 	}
+
 	// 活动【新】标签Map
 	newLabelMap, _, e := GetActivityNewLabelMap(activityIds)
 	if e != nil {
@@ -556,7 +559,7 @@ func GetActivityNewLabelMap(activityIds []int) (labelMap map[int]bool, industryN
 	// 获取活动关联的产业
 	var groupCond string
 	var groupPars []interface{}
-	groupCond += ` AND a.activity_id IN (` + utils.GetOrmInReplace(len(activityIds)) + `) AND b.source = 1 `
+	groupCond += ` AND a.activity_id IN (` + utils.GetOrmInReplace(len(activityIds)) + `) AND b.source = 1  AND  a.active_state != 3 `
 	groupPars = append(groupPars, activityIds)
 	groups, e := models.GetActivityIndustryRelationList(groupCond, groupPars)
 	if e != nil {

services/activity_special.go

@@ -56,8 +56,6 @@ func ActivityLabelSpecialSql(chartPermissionIds, whichDay, activeState string) (
 		}
 		condition += ` AND art.activity_time >= ` + "'" + startDate + " 00:00:00'"
 		condition += ` AND art.activity_time <= ` + "'" + endDate + " 23:59:59'"
-		condition += ` AND art.activity_time >= ` + "'" + startDate + " 00:00:00'"
-		condition += ` AND art.activity_time <= ` + "'" + endDate + " 23:59:59'"
 	}
 	if activeState == "2" {
 		condition += ` AND art.days > 0  AND art.activity_time <= ` + "'" + time.Now().Format(utils.FormatDateTime) + " '"
@@ -67,7 +65,7 @@ func ActivityLabelSpecialSql(chartPermissionIds, whichDay, activeState string) (
 }
 
 //处理专项调研的展示
-func GetActivityLabelSpecialList(user *models.WxUserItem, chartPermissionIds string) (item *models.ActivityTypeHome, err error) {
+func GetActivityLabelSpecialList(user *models.WxUserItem, conditionActivitySpecial string) (item *models.ActivityTypeHome, err error) {
 	itemList := new(models.ActivityTypeHome)
 	if user.CompanyId <= 1 {
 		itemList.List = make([]*models.CygxActivityLabelList, 0)
@@ -109,15 +107,15 @@ func GetActivityLabelSpecialList(user *models.WxUserItem, chartPermissionIds str
 		}
 	}
 	var pars []interface{}
-	condition += ` AND art.publish_status = 1  AND art.label != ''  AND art.is_offline = 0 `
+	condition += ` AND art.publish_status = 1  AND art.label != ''  AND art.is_offline = 0 ` + conditionActivitySpecial
 
 	////行业名称
 	//if isPower == 1 {
 	//	condition += ` AND art.chart_permission_name  IN (` + permissionNameStr + `) `
 	//}
-	if chartPermissionIds != "" {
-		condition += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `) `
-	}
+	//if chartPermissionIds != "" {
+	//	condition += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `) `
+	//}
 	conditionTrip := condition
 	conditionTrip += ` AND art.days > 0  ORDER BY art.activity_time ASC `
 	specialList, err := models.GetActivityLabelSpecialListAll(conditionTrip, pars, 0, 8)