Merge branch 'cygx_11.0' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity.go

@@ -2390,6 +2390,11 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
 			item.IsResearch = true
 		}
 
+		//易董同步过来的活动只展示外部资源标签
+		if v.YidongActivityId != "" {
+			item.IsResearchPoints = false
+			item.IsResearch = false
+		}
 		item.IsExternalLabel = v.IsExternalLabel
 
 		mapActivity[v.ActivityTypeId] = append(mapActivity[v.ActivityTypeId], item)

models/activity.go

@@ -788,7 +788,7 @@ type CygxActivityLabelList struct {
 	Resource          int    `description:"位置 ，1：活动 ，2：专项产业调研"`
 	TemporaryLabel    string `description:"临时标签"`
 	IsNew             bool   `description:"是否为新：活动存在关联的的产业所关联的报告均在3个月内/无报告则标记新"`
-	YidongActivityId  int    `description:"易董活动ID"`
+	YidongActivityId  string `description:"易董活动ID"`
 	IsExternalLabel   bool   `description:"是否为外部资源"`
 	IsResearchPoints  bool   `description:"是否为研选扣点"`
 	TripStatus        int    `description:"行程进行状态 1：预报名，2：确定行程"`

services/activity.go

@@ -2324,6 +2324,10 @@ func ActivityButtonShow(item *models.ActivityDetail) (activityDetail *models.Act
 		activityDetail.SourceType = 1
 		activityDetail.IsShowSignup = false
 		activityDetail.IsShowDetails = true
+
+		activityDetail.IsExternalLabel = true
+		activityDetail.IsResearch = false
+		activityDetail.IsResearchSpecial = false
 		return
 	}
 
@@ -2407,13 +2411,6 @@ func ActivityButtonShow(item *models.ActivityDetail) (activityDetail *models.Act
 		activityDetail.IsShowOutboundCall = false
 	}
 
-	//如果是易董同步过来的，只展示外部资源标签
-	if activityDetail.YidongActivityId != "" {
-		activityDetail.IsExternalLabel = true
-		activityDetail.IsResearch = false
-		activityDetail.IsResearchSpecial = false
-	}
-
 	return
 }