Merge branch 'cygx_7.2_yidongapi' of http://8.136.199.33:3000/hongze/hongze_cygx into cygx_7.3_yin_ping

services/activity.go

@@ -1328,8 +1328,9 @@ func ActivityButtonShow(item *models.ActivityDetail) (articleDetail *models.Acti
 	//	articleDetail.IsShowAppointment = IsShowAppointmentByactivityInfo(articleDetail, articleDetail.ChartPermissionName)
 	//}
 	articleDetail.IsShowAppointment = false
+	//易董的操作按钮都隐藏
 	if articleDetail.YidongActivityId != "" {
-		articleDetail.IsShowSignup = true
+		articleDetail.IsShowSignup = false
 		return
 	}
 	//新的是否展示规则

services/yidong.go

@@ -92,6 +92,9 @@ func GetActivityTypeNameWithYiDong(industrySwName string) (chartPermissionName s
 		"医药生物": utils.YI_YAO_NAME,
 		//医药
 
+		"策略": utils.CE_LUE_NAME,
+		//策略
+
 		"非银金融": utils.CHART_PERMISSION_NAME_MF_YANXUAN,
 		"建筑装饰": utils.CHART_PERMISSION_NAME_MF_YANXUAN,
 		"基础化工": utils.CHART_PERMISSION_NAME_MF_YANXUAN,
@@ -240,7 +243,7 @@ func GetYiDongActivity(cont context.Context) (err error) {
 			item.YidongActivityId = v.ID
 			item.ActivityTypeId = 3
 			item.ActivityTypeName = "公司调研电话会"
-			item.ActivityName = v.Title
+			item.ActivityName = v.CompanyInfo + v.Title
 			item.Label = v.CompanyInfo
 			item.TemporaryLabel = v.CompanyInfo
 			item.ChartPermissionId = GetActivityTypeIdWithYiDong(v.IndustrySwName)