文章详请添加字段

controllers/article.go

@@ -133,7 +133,14 @@ func (this *ArticleController) Detail() {
 				articlePermissionPermissionName = detail.CategoryName
 			}
 
-			if strings.Contains(companyPermission, articlePermissionPermissionName) {
+			var hasPersion bool
+			slice := strings.Split(articlePermissionPermissionName, ",")
+			for _, v := range slice {
+				if strings.Contains(companyPermission, v) {
+					hasPersion = true
+				}
+			}
+			if hasPersion {
 				hasPermission = 1
 				historyRecord := new(models.CygxArticleHistoryRecord)
 				historyRecord.UserId = uid
@@ -160,7 +167,6 @@ func (this *ArticleController) Detail() {
 			} else { //无该行业权限
 				hasPermission = 3
 			}
-
 			if hasPermission == 1 {
 				key := "CYGX_ARTICLE_" + strconv.Itoa(articleId) + "_" + strconv.Itoa(uid)
 				if !utils.Rc.IsExist(key) {
@@ -179,6 +185,9 @@ func (this *ArticleController) Detail() {
 				}
 			}
 		}
+		if strings.Contains(detail.CategoryName, "研选") {
+			detail.IsResearch = true
+		}
 		collectCount, err := models.GetArticleCollectCount(uid, articleId)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取信息失败"
@@ -210,7 +219,6 @@ func (this *ArticleController) Detail() {
 			detail.SellerName = sellerItem.RealName
 		}
 		sellerList, err := models.GetSellerList(articleId)
-		fmt.Println(err)
 		if err != nil {
 			br.Msg = "获取信息失败"
 			br.ErrMsg = "获取销售数据失败，Err:" + err.Error() + strconv.Itoa(uid) + ";articleId" + strconv.Itoa(articleId)
@@ -242,6 +250,7 @@ Loop:
 		detail.Body = ""
 		detail.BodyText = ""
 	}
+	fmt.Println(hasPermission)
 	resp := new(models.ArticleDetailResp)
 	resp.HasPermission = hasPermission
 	resp.HasFree = hasFree

controllers/report.go

@@ -178,10 +178,6 @@ func (this *ReportController) IndustryList() {
 	if orderColumn == "" {
 		orderColumn = "NewTime"
 	}
-	//if ChartPermissionId < 1 {
-	//	br.Msg = "请输入分类ID"
-	//	return
-	//}
 	if orderColumn == "NewTime" {
 		orderSrt = "update_time DESC"
 	} else {
@@ -189,43 +185,51 @@ func (this *ReportController) IndustryList() {
 	}
 	fmt.Println(orderSrt)
 	//全部都是置顶
-	if totalTop >= currentIndex*pageSize {
-		listTop, err := models.GetIndustrialManagementTopAll(uid, condition, startSize, pageSize)
-		for k, _ := range listTop {
-			listTop[k].IsTop = true
-		}
-		if err != nil {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
-			return
-		}
-		list = listTop
-	} else if totalTop < (currentIndex-1)*pageSize { //全部都是不置顶
-		listNoTop, err := models.GetIndustrialManagementAll(uid, condition, orderSrt, startSize-totalTop, pageSize)
-		if err != nil {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
-			return
-		}
-		list = listNoTop
-	} else { //部分置顶，部分不置顶
-		listTop, err := models.GetIndustrialManagementTopAll(uid, condition, startSize, pageSize)
-		if err != nil {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
-			return
-		}
-		for k, _ := range listTop {
-			listTop[k].IsTop = true
-		}
-		listNoTop, err := models.GetIndustrialManagementAll(uid, condition, orderSrt, 0, pageSize-len(listTop))
-		if err != nil {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
-			return
-		}
-		list = append(listTop, listNoTop...)
+	//if totalTop >= currentIndex*pageSize {
+	//	listTop, err := models.GetIndustrialManagementTopAll(uid, condition, startSize, pageSize)
+	//	for k, _ := range listTop {
+	//		listTop[k].IsTop = true
+	//	}
+	//	if err != nil {
+	//		br.Msg = "获取信息失败"
+	//		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
+	//		return
+	//	}
+	//	list = listTop
+	//} else if totalTop < (currentIndex-1)*pageSize { //全部都是不置顶
+	//	listNoTop, err := models.GetIndustrialManagementAll(uid, condition, orderSrt, startSize-totalTop, pageSize)
+	//	if err != nil {
+	//		br.Msg = "获取信息失败"
+	//		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
+	//		return
+	//	}
+	//	list = listNoTop
+	//} else { //部分置顶，部分不置顶
+	//	listTop, err := models.GetIndustrialManagementTopAll(uid, condition, startSize, pageSize)
+	//	if err != nil {
+	//		br.Msg = "获取信息失败"
+	//		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
+	//		return
+	//	}
+	//	for k, _ := range listTop {
+	//		listTop[k].IsTop = true
+	//	}
+	//	listNoTop, err := models.GetIndustrialManagementAll(uid, condition, orderSrt, 0, pageSize-len(listTop))
+	//	if err != nil {
+	//		br.Msg = "获取信息失败"
+	//		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
+	//		return
+	//	}
+	//	list = append(listTop, listNoTop...)
+	//}
+
+	listNoTop, err := models.GetIndustrialManagementAll(uid, condition, orderSrt, startSize, pageSize)
+	if err != nil {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
+		return
 	}
+	list = listNoTop
 	for k, v := range list {
 		//var analystStr string
 		//analystList, err := models.GetIndustrialAnalystAll(v.IndustrialManagementId)
@@ -262,7 +266,6 @@ func (this *ReportController) IndustryList() {
 			br.ErrMsg = "获取信息失败，Err:" + strconv.Itoa(uid) + ";articleId" + strconv.Itoa(newArtinfo.ArticleId)
 			return
 		}
-		//
 		if recordCount == 0 && user.CreatedTime.Before(utils.StrTimeToTime(newArtinfo.PublishDate)) && utils.StrTimeToTime(utils.OnlineTime).Before(utils.StrTimeToTime(newArtinfo.PublishDate)) {
 			list[k].IsRed = true
 		}

models/article.go

@@ -107,8 +107,13 @@ type ArticleDetail struct {
 	CategoryId           int    `description:"分类ID"`
 	IsSummary            int    `description:"是否是纪要库，1是，0否"`
 	IsReport             int    `description:"是否属于报告，1是，0否"`
+	IsResearch           bool   `description:"是否属于研选"`
 	FileLink             string `description:"下载预览链接"`
 	SellerAndMobile      string `description:"销售和手机号"`
+	IsFollow             int    `description:"是否关注，1是，0否"`
+	IsCollection         int    `description:"是否收藏，1是，0否"`
+	FollowNum            int    `description:"关注数量"`
+	CollectionNum        int    `description:"收藏数量"`
 	SellerList           []*SellerRep
 }
 

models/report.go

@@ -24,6 +24,8 @@ type IndustrialManagement struct {
 	AnalystList            []*IndustrialAnalyst `description:"分析师列表"`
 	Analyst                string               `description:"分析师"`
 	IndustrialSubjectList  []*IndustrialSubject `description:"标的列表"`
+	IsHot                  bool                 `description:"是否是热门"`
+	IsFollow               int                  `description:"是否关注"`
 }
 
 type IndustrialAnalyst struct {

services/task.go

@@ -35,29 +35,29 @@ func Task() {
 
 	//UpdateActivitySattus()
 	//修改任务状态
-	//updateActivitySattus := task.NewTask("syncTacticsListAddreport", "0 */1 8-22 * * *", UpdateActivitySattus)
-	//task.AddTask("updateActivitySattus", updateActivitySattus)
-	////更新深 和新的标签
-	//updateIndustrialManagementLabel := task.NewTask("updateIndustrialManagementLabel", "0 */30 * * * *", UpdateIndustrialManagementLabel)
-	//task.AddTask("updateIndustrialManagementLabel", updateIndustrialManagementLabel)
-	////更新报告的搜索栏内容
-	////UpdateIndustrialManagementSubjectNnames()
-	////会议提醒模板消息推送
-	//sendActivityBeginMsg := task.NewTask("sendActivityBeginMsg", "0 */10 8-22 * * *", SendActivityBeginMsg) //会议前60分钟的提醒
-	//task.AddTask("sendActivityBeginMsg", sendActivityBeginMsg)
-	//sendActivityBeginMsgMeeting := task.NewTask("sendActivityBeginMsgMeeting", "0 */5 8-22 * * *", SendActivityBeginMsgMeeting) //会议前15分钟的提醒
-	//task.AddTask("sendActivityBeginMsgMeeting", sendActivityBeginMsgMeeting)
-	////预约外呼名单，会前1小时自动发送邮件给专家组
-	//sendEmailFileToExpert := task.NewTask("sendEmailFileToExpert", "0 */5 8-22 * * *", SendEmailFileToExpert) //预约外呼名单，会前1小时自动发送邮件给专家组
-	//task.AddTask("sendEmailFileToExpert", sendEmailFileToExpert)
-	//
-	//////白名单发送
-	////sendEmailUserWhiteList := task.NewTask("sendEmailUserWhiteList", "0 27 17 * * *", SendEmailUserWhiteList) //预约外呼名单，会前1小时自动发送邮件给专家组
-	////task.AddTask("sendEmailUserWhiteList", sendEmailUserWhiteList)
-	//
-	////白名单发送2
-	//sendEmailUserWhiteListChange := task.NewTask("sendEmailUserWhiteListChange", "0 00 17 * * *", SendEmailUserWhiteListChange) //新增 和冻结的客户白名单
-	//task.AddTask("sendEmailUserWhiteListChange", sendEmailUserWhiteListChange)
+	updateActivitySattus := task.NewTask("syncTacticsListAddreport", "0 */1 8-22 * * *", UpdateActivitySattus)
+	task.AddTask("updateActivitySattus", updateActivitySattus)
+	//更新深 和新的标签
+	updateIndustrialManagementLabel := task.NewTask("updateIndustrialManagementLabel", "0 */30 * * * *", UpdateIndustrialManagementLabel)
+	task.AddTask("updateIndustrialManagementLabel", updateIndustrialManagementLabel)
+	//更新报告的搜索栏内容
+	//UpdateIndustrialManagementSubjectNnames()
+	//会议提醒模板消息推送
+	sendActivityBeginMsg := task.NewTask("sendActivityBeginMsg", "0 */10 8-22 * * *", SendActivityBeginMsg) //会议前60分钟的提醒
+	task.AddTask("sendActivityBeginMsg", sendActivityBeginMsg)
+	sendActivityBeginMsgMeeting := task.NewTask("sendActivityBeginMsgMeeting", "0 */5 8-22 * * *", SendActivityBeginMsgMeeting) //会议前15分钟的提醒
+	task.AddTask("sendActivityBeginMsgMeeting", sendActivityBeginMsgMeeting)
+	//预约外呼名单，会前1小时自动发送邮件给专家组
+	sendEmailFileToExpert := task.NewTask("sendEmailFileToExpert", "0 */5 8-22 * * *", SendEmailFileToExpert) //预约外呼名单，会前1小时自动发送邮件给专家组
+	task.AddTask("sendEmailFileToExpert", sendEmailFileToExpert)
+
+	////白名单发送
+	//sendEmailUserWhiteList := task.NewTask("sendEmailUserWhiteList", "0 27 17 * * *", SendEmailUserWhiteList) //预约外呼名单，会前1小时自动发送邮件给专家组
+	//task.AddTask("sendEmailUserWhiteList", sendEmailUserWhiteList)
+
+	//白名单发送2
+	sendEmailUserWhiteListChange := task.NewTask("sendEmailUserWhiteListChange", "0 00 17 * * *", SendEmailUserWhiteListChange) //新增 和冻结的客户白名单
+	task.AddTask("sendEmailUserWhiteListChange", sendEmailUserWhiteListChange)
 
 	//editOutboundMobile := task.NewTask("editOutboundMobile", "0 */1 8-22 * * *", EditOutboundMobile) //同步外呼号码与手机号
 	//task.AddTask("sendEmailFileToExpert", editOutboundMobile)