no message

controllers/activity.go

@@ -25,6 +25,7 @@ type ActivityController struct {
 // @Param   IsPower   query   int  false       "是否选择有权限行业 ，1是 0 否 默认0"
 // @Param   IsExternalLabel   query   int  false       "是否仅展示外部资源 1：是、0：否 默认0"
 // @Param   IsResearchPoints   query   int  false       "是否仅展示研选扣点 1：是、0：否 默认0"
+// @Param   IsResearch   query   bool  true       "是否为研选"
 // @Success 200 {object} models.ActivityTypeListHomeResp
 // @router /labelTypeList [get]
 func (this *ActivityController) LabelTypeList() {
@@ -45,6 +46,7 @@ func (this *ActivityController) LabelTypeList() {
 	activeState := this.GetString("ActiveState")
 	isExternalLabel, _ := this.GetInt("IsExternalLabel")   //
 	isResearchPoints, _ := this.GetInt("IsResearchPoints") //
+	isResearch, _ := this.GetBool("IsResearch", false)     // 是否为研选 查研观向11.0 （研选活动独立显示）
 	var condition string
 	var conditioninit string
 	var pars []interface{}
@@ -57,6 +59,11 @@ func (this *ActivityController) LabelTypeList() {
 	//condition += `AND art.activity_time > ?  `
 	//pars = append(pars, time.Now().AddDate(0, -3, 0).Format(utils.FormatDate))
 
+	if isResearch {
+		chartPermissionIds = strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN)
+	} else {
+		conditioninit += ` AND ( art.chart_permission_id  !=  '` + strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + `'  OR  ( art.is_show_hz = 1 AND art.chart_permission_id  =  '` + strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + `')  )`
+	}
 	//行业名称
 	if len(chartPermissionIds) > 0 {
 		conditioninit += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `)`
@@ -140,9 +147,13 @@ func (this *ActivityController) LabelTypeList() {
 		br.ErrMsg = "获取数据失败，Err:" + err.Error()
 		return
 	}
-	//return
-
-	list, err := models.GetActivityTypeHomeList()
+	var conditionType string
+	if isResearch {
+		conditionType = " source_type IN (0,2) "
+	} else {
+		conditionType = " source_type IN (0,1) "
+	}
+	list, err := models.GetActivityTypeHomeList(conditionType)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败，Err:" + err.Error()

controllers/article.go

@@ -315,7 +315,9 @@ Loop:
 			utils.Rc.Put(key, 1, 30*time.Second)
 		}
 	}
-	detail.IsApplyAppointmentExpert = services.GetIsApplyAppointmentExpert(user, articleId) // 获取用户数是否约访专家的请求  查研观向11.0
+	if detail.ArticleTypeId == 14 {
+		detail.IsApplyAppointmentExpert = true //判断文章类型是否属于专家访谈  查研观向11.0
+	}
 	if detail.SubCategoryName == "专项调研" {
 		detail.IsSpecialArticle = true
 	}

models/activity_type.go

@@ -59,12 +59,13 @@ type CygxActivityLabelList struct {
 	TripStatus        int    `description:"行程进行状态 1：预报名，2：确定行程"`
 	City              string `description:"城市"`
 	Days              int    `description:"天数"`
+	IsResearch        bool   `description:"是否属于研选"`
 }
 
 // 列表
-func GetActivityTypeHomeList() (items []*ActivityTypeHome, err error) {
+func GetActivityTypeHomeList(condition string) (items []*ActivityTypeHome, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM cygx_activity_type WHERE activity_type_id != 7   ORDER BY sort DESC`
+	sql := `SELECT * FROM cygx_activity_type WHERE activity_type_id != 7 ` + condition + `   ORDER BY sort DESC`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }

models/article.go

@@ -78,7 +78,7 @@ type ArticleDetail struct {
 	IsSpecialArticle         bool            `description:"是否属于专项调研报告"`
 	SubCategoryName          string          `description:"二级分类"`
 	ArticleTypeId            int             `description:"文章类型ID"`
-	IsApplyAppointmentExpert bool            `description:"是否预约过专家"`
+	IsApplyAppointmentExpert bool            `description:"是否属于专家访谈"`
 }
 
 type CygxArticleIdReq struct {

services/activity.go

@@ -513,6 +513,10 @@ func HandleActivityTypeHomeList(listType []*models.ActivityTypeHome, listActivit
 		}
 		item.Resource = 1
 		item.ActivityId = v.ActivityId
+
+		if v.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
+			item.IsResearch = true
+		}
 		if v.IsExternalLabel > 0 {
 			item.IsExternalLabel = true
 		}

services/article.go

@@ -159,8 +159,9 @@ func HandleArticleCategoryImg(list []*models.ArticleListResp, user *models.WxUse
 				list[k].ImgUrlPc = utils.ZHI_ZAO_OTHER_IMG
 			}
 		}
-		list[k].IsResearch = utils.InArrayByInt(utils.YAN_XUAN_ARTICLE_TYPE_ID, v.ArticleTypeId)
-
+		if v.ArticleTypeId > 0 {
+			list[k].IsResearch = true
+		}
 	}
 
 	articleIds := make([]int, 0)