活动列表页标签修改

controllers/activity.go

@@ -280,16 +280,33 @@ func (this *ActivityCoAntroller) ActivityList() {
 		br.ErrMsg = "城市配置信息失败，Err:" + err.Error()
 		return
 	}
+	detailChart, err := models.GetConfigByCode("chart_img_url")
+	if err != nil {
+		br.Msg = "获取数据失败"
+		br.ErrMsg = "行业配置信息失败，Err:" + err.Error()
+		return
+	}
+
 	addressList := strings.Split(detail.ConfigValue, "{|}")
 	mapAddress := make(map[string]string)
+	chartList := strings.Split(detailChart.ConfigValue, "{|}")
+	mapChart := make(map[string]string)
 	var cityName string
+	var chartName string
 	var imgUrl string
+	var imgUrlChart string
 	for _, v := range addressList {
 		vslice := strings.Split(v, "_")
 		cityName = vslice[0]
 		imgUrl = vslice[len(vslice)-1]
 		mapAddress[cityName] = imgUrl
 	}
+	for _, v := range chartList {
+		vslice := strings.Split(v, "_")
+		chartName = vslice[0]
+		imgUrlChart = vslice[len(vslice)-1]
+		mapChart[chartName] = imgUrlChart
+	}
 	for k, v := range list {
 		if strings.Contains(v.ActivityName, "【") {
 			list[k].IsBrackets = 1
@@ -309,6 +326,10 @@ func (this *ActivityCoAntroller) ActivityList() {
 			} else {
 				list[k].ImgUrl = mapAddress["其它"]
 			}
+		} else {
+			if mapChart[v.ChartPermissionName] != "" {
+				list[k].ImgUrl = mapChart[v.ChartPermissionName]
+			}
 		}
 		expertTxt, _ := services.GetReportContentTextSub(v.Expert)
 		list[k].Expert = expertTxt
@@ -424,16 +445,33 @@ func (this *ActivityCoAntroller) ScheduleList() {
 		br.ErrMsg = "城市配置信息失败，Err:" + err.Error()
 		return
 	}
+	detailChart, err := models.GetConfigByCode("chart_img_url")
+	if err != nil {
+		br.Msg = "获取数据失败"
+		br.ErrMsg = "行业配置信息失败，Err:" + err.Error()
+		return
+	}
+
 	addressList := strings.Split(detail.ConfigValue, "{|}")
 	mapAddress := make(map[string]string)
+	chartList := strings.Split(detailChart.ConfigValue, "{|}")
+	mapChart := make(map[string]string)
 	var cityName string
+	var chartName string
 	var imgUrl string
+	var imgUrlChart string
 	for _, v := range addressList {
 		vslice := strings.Split(v, "_")
 		cityName = vslice[0]
 		imgUrl = vslice[len(vslice)-1]
 		mapAddress[cityName] = imgUrl
 	}
+	for _, v := range chartList {
+		vslice := strings.Split(v, "_")
+		chartName = vslice[0]
+		imgUrlChart = vslice[len(vslice)-1]
+		mapChart[chartName] = imgUrlChart
+	}
 	for k, v := range list {
 		if strings.Contains(v.ActivityName, "【") {
 			list[k].IsBrackets = 1
@@ -454,6 +492,10 @@ func (this *ActivityCoAntroller) ScheduleList() {
 			} else {
 				list[k].ImgUrl = mapAddress["其它"]
 			}
+		} else {
+			if mapChart[v.ChartPermissionName] != "" {
+				list[k].ImgUrl = mapChart[v.ChartPermissionName]
+			}
 		}
 		expertTxt, _ := services.GetReportContentTextSub(v.Expert)
 		list[k].Expert = expertTxt
@@ -1923,7 +1965,7 @@ func (this *ActivityCoAntroller) LabelTypeList() {
 	}
 
 	var startSize int
-	pageSize = 4
+	pageSize = 40
 	var sortTime string
 	var pars []interface{}
 	//活动可见限制
@@ -2012,6 +2054,7 @@ func (this *ActivityCoAntroller) LabelTypeList() {
 		//标签字段关联的产业与标签处理
 		for k2, v2 := range labelList {
 			labelList[k2].KeyWord = services.LabelStr(v2.KeyWord)
+			labelList[k2].ImgUrlBg = v.ImgUrlBg
 		}
 		list[k].List = labelList
 	}
@@ -2318,16 +2361,33 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 		br.ErrMsg = "城市配置信息失败，Err:" + err.Error()
 		return
 	}
+	detailChart, err := models.GetConfigByCode("chart_img_url")
+	if err != nil {
+		br.Msg = "获取数据失败"
+		br.ErrMsg = "行业配置信息失败，Err:" + err.Error()
+		return
+	}
+
 	addressList := strings.Split(detail.ConfigValue, "{|}")
 	mapAddress := make(map[string]string)
+	chartList := strings.Split(detailChart.ConfigValue, "{|}")
+	mapChart := make(map[string]string)
 	var cityName string
+	var chartName string
 	var imgUrl string
+	var imgUrlChart string
 	for _, v := range addressList {
 		vslice := strings.Split(v, "_")
 		cityName = vslice[0]
 		imgUrl = vslice[len(vslice)-1]
 		mapAddress[cityName] = imgUrl
 	}
+	for _, v := range chartList {
+		vslice := strings.Split(v, "_")
+		chartName = vslice[0]
+		imgUrlChart = vslice[len(vslice)-1]
+		mapChart[chartName] = imgUrlChart
+	}
 
 	for k, v := range list {
 		if strings.Contains(v.ActivityName, "【") {
@@ -2342,12 +2402,17 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 		if v.ChartPermissionName == "研选" && v.ActivityTypeId == 1 {
 			list[k].ActivityTypeName = "研选电话会"
 		}
+		fmt.Println(v.ChartPermissionName)
 		if v.ActivityType == 0 {
 			if mapAddress[v.City] != "" {
 				list[k].ImgUrl = mapAddress[v.City]
 			} else {
 				list[k].ImgUrl = mapAddress["其它"]
 			}
+		} else {
+			if mapChart[v.ChartPermissionName] != "" {
+				list[k].ImgUrl = mapChart[v.ChartPermissionName]
+			}
 		}
 		expertTxt, _ := services.GetReportContentTextSub(v.Expert)
 		list[k].Expert = expertTxt

controllers/config.go

@@ -62,7 +62,7 @@ func (this *ConfigController) PageHistory() {
 	}
 	pageType := req.PageType
 	var havePageType bool
-	PageType := []string{"Summary", "SummarySearch", "Report", "ReportSearch", "IndustryList", "Activit", "ActivitSearch", "ActivitParticulars", "ReportParticulars"}
+	PageType := []string{"Summary", "SummarySearch", "Report", "ReportSearch", "IndustryList", "Activit", "ActivitSearch", "ActivitParticulars", "ReportParticulars", "MySchedule", "LabelMore", "ArticleCopy"}
 	for _, v := range PageType {
 		if pageType == v {
 			havePageType = true

models/activity.go

@@ -461,6 +461,7 @@ type CygxActivityLabelList struct {
 	KeyWord     string `orm:"column(label)";description:"主题"`
 	Timesort    string `description:"最大时间"`
 	Mintimesort string `description:"最小时间"`
+	ImgUrlBg    string `description:"背景图片"`
 }
 
 //主题列表

models/page_history_record.go

@@ -23,7 +23,7 @@ type CygxPageHistoryRecordRep struct {
 	DetailId               string `description:"详情ID"`
 	ChartPermissionId      int    `description:"行业ID"`
 	IndustrialManagementId string `description:"产业ID"`
-	PageType               string `description:"页面类型，纪要：Summary，纪要搜索：SummarySearch，报告：Report，报告搜索：ReportSearch，产业列表：IndustryList，活动：Activit，活动搜索：ActivitSearch，活动详情：ActivitParticulars，报告详情：ReportParticulars"`
+	PageType               string `description:"页面类型，纪要：Summary，纪要搜索：SummarySearch，报告：Report，报告搜索：ReportSearch，产业列表：IndustryList，活动：Activit，活动搜索：ActivitSearch，活动详情：ActivitParticulars，报告详情：ReportParticulars , 我的日程：MySchedule, 更多标签：LabelMore ， 文章复制：ArticleCopy"`
 }
 
 //添加

services/task.go

@@ -54,7 +54,7 @@ func Task() {
 		chageIndustrialArticleNum := task.NewTask("chageIndustrialArticleNum", "0 01 00 * * *", ChageIndustrialArticleNum) //更改对应产业的文章阅读数量
 		task.AddTask("chageIndustrialArticleNum", chageIndustrialArticleNum)
 	}
-	ActivityAttendanceDetail()
+	//ActivityAttendanceDetail()
 	//SynchronizationArthistory()//同步原有的阅读记录
 	//GetAddpArticle() //同步日度点评数据
 	task.StartTask()