no message

controllers/report.go

@@ -798,6 +798,7 @@ func (this *ReportController) CategoryFllow() {
 // @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
 // @Param   KeyWord   query   string  true       "搜索关键词"
 // @Param   ArticleType   query   int  true       "文章类型，1弘则报告、2研选 "
+// @Param   IsAll   query   bool  true       "是否为综合 "
 // @Success 200 {object} models.ReoprtSearchResp
 // @router /searchReport [get]
 func (this *MobileReportController) SearchReport() {
@@ -816,6 +817,7 @@ func (this *MobileReportController) SearchReport() {
 	currentIndex, _ := this.GetInt("CurrentIndex")
 	articleType, _ := this.GetInt("ArticleType", 1)
 	keyWord := this.GetString("KeyWord")
+	isAll, _ := this.GetBool("IsAll")
 	var condition string
 	var pars []interface{}
 	//var conditionSql string
@@ -824,6 +826,9 @@ func (this *MobileReportController) SearchReport() {
 	if pageSize <= 0 {
 		pageSize = utils.PageSize20
 	}
+	if isAll {
+		pageSize = utils.PageSize5
+	}
 	if currentIndex <= 0 {
 		currentIndex = 1
 	}
@@ -842,38 +847,6 @@ func (this *MobileReportController) SearchReport() {
 		br.ErrMsg = "研选分类ID不能为空"
 		return
 	}
-	//condition = `AND ( a.title LIKE '%` + keyWord + `%' OR  a.body LIKE '%` + keyWord + `%' OR  a.annotation LIKE '%` + keyWord + `%' OR  a.abstract LIKE '%` + keyWord + `%') AND a.publish_status = 1 `
-	if articleType == 1 {
-		condition = `  AND ( a.title LIKE '%` + keyWord + `%' OR  a.body LIKE '%` + keyWord + `%' OR  a.annotation LIKE '%` + keyWord + `%' OR  a.abstract LIKE '%` + keyWord + `%') AND a.publish_status = 1  AND a.article_type_id NOT IN (` + articleTypeIds + `)  `
-		total, err = models.GetReoprtSearchCountHz(condition)
-	} else {
-		condition = `  AND ( a.title LIKE '%` + keyWord + `%' OR  a.body LIKE '%` + keyWord + `%' OR  a.annotation LIKE '%` + keyWord + `%' OR  a.abstract LIKE '%` + keyWord + `%') AND a.publish_status = 1  AND a.article_type_id  IN (` + articleTypeIds + `)  `
-		total, err = models.GetReoprtSearchCountYx(condition)
-	}
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.Msg = "获取总数失败，Err:" + err.Error()
-		return
-	}
-	var list []*models.ArticleListResp
-	//list := new([]models.ArticleResearchResp)
-	if articleType == 1 {
-		list, err = models.GetArticleResearchListHz(condition, pars, startSize, pageSize, user.UserId)
-	} else {
-		list, err = models.GetArticleResearchList(condition, pars, startSize, pageSize, user.UserId)
-	}
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
-		return
-	}
-	//return
-	list, err = services.HandleArticleCategoryImg(list, user)
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "HandleArticleCategoryImg,Err:" + err.Error()
-		return
-	}
 	//处理对应的文章类型标签按钮
 	nameMap, styleMap, err := services.GetArticleTypeMap()
 	if err != nil {
@@ -881,99 +854,139 @@ func (this *MobileReportController) SearchReport() {
 		br.ErrMsg = "GetArticleTypeMap Err:" + err.Error()
 		return
 	}
-	for _, v := range list {
-		item := models.ArticleResearchResp{
-			ArticleId:       v.ArticleId,
-			ArticleTypeId:   v.ArticleTypeId,
-			Title:           v.Title,
-			PublishDate:     v.PublishDate,
-			DepartmentId:    v.DepartmentId,
-			NickName:        v.NickName,
-			IsCollect:       v.IsCollect,
-			Pv:              v.Pv,
-			CollectNum:      v.CollectNum,
-			Abstract:        v.Abstract,
-			Annotation:      v.Annotation,
-			ImgUrlPc:        v.ImgUrlPc,
-			ArticleTypeName: nameMap[v.ArticleTypeId],
-			ButtonStyle:     styleMap[v.ArticleTypeId],
-			List:            v.List,
+	if isAll {
+		total = utils.PageSize5
+		conditionHz := `  AND ( a.title LIKE '%` + keyWord + `%' OR  a.body LIKE '%` + keyWord + `%' OR  a.annotation LIKE '%` + keyWord + `%' OR  a.abstract LIKE '%` + keyWord + `%') AND a.publish_status = 1  AND a.article_type_id NOT IN (` + articleTypeIds + `)  `
+		conditionYx := `  AND ( a.title LIKE '%` + keyWord + `%' OR  a.body LIKE '%` + keyWord + `%' OR  a.annotation LIKE '%` + keyWord + `%' OR  a.abstract LIKE '%` + keyWord + `%') AND a.publish_status = 1  AND a.article_type_id  IN (` + articleTypeIds + `)  `
+
+		listHz, err := models.GetArticleResearchListHz(conditionHz, pars, startSize, pageSize, user.UserId)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
+			return
 		}
-		if articleType == 1 {
+		listYx, err := models.GetArticleResearchList(conditionYx, pars, startSize, pageSize, user.UserId)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
+			return
+		}
+
+		listHz, err = services.HandleArticleCategoryImg(listHz, user)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "HandleArticleCategoryImg,Err:" + err.Error()
+			return
+		}
+
+		listYx, err = services.HandleArticleCategoryImg(listYx, user)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "HandleArticleCategoryImg,Err:" + err.Error()
+			return
+		}
+
+		for _, v := range listHz {
+			item := models.ArticleResearchResp{
+				ArticleId:       v.ArticleId,
+				ArticleTypeId:   v.ArticleTypeId,
+				Title:           v.Title,
+				PublishDate:     v.PublishDate,
+				DepartmentId:    v.DepartmentId,
+				NickName:        v.NickName,
+				IsCollect:       v.IsCollect,
+				Pv:              v.Pv,
+				CollectNum:      v.CollectNum,
+				Abstract:        v.Abstract,
+				Annotation:      v.Annotation,
+				ImgUrlPc:        v.ImgUrlPc,
+				ArticleTypeName: nameMap[v.ArticleTypeId],
+				ButtonStyle:     styleMap[v.ArticleTypeId],
+				List:            v.List,
+			}
 			resp.ListHz = append(resp.ListHz, &item)
-		} else {
+		}
+
+		for _, v := range listYx {
+			item := models.ArticleResearchResp{
+				ArticleId:       v.ArticleId,
+				ArticleTypeId:   v.ArticleTypeId,
+				Title:           v.Title,
+				PublishDate:     v.PublishDate,
+				DepartmentId:    v.DepartmentId,
+				NickName:        v.NickName,
+				IsCollect:       v.IsCollect,
+				Pv:              v.Pv,
+				CollectNum:      v.CollectNum,
+				Abstract:        v.Abstract,
+				Annotation:      v.Annotation,
+				ImgUrlPc:        v.ImgUrlPc,
+				ArticleTypeName: nameMap[v.ArticleTypeId],
+				ButtonStyle:     styleMap[v.ArticleTypeId],
+				List:            v.List,
+			}
 			resp.ListYx = append(resp.ListYx, &item)
 		}
+	} else {
+
+		//condition = `AND ( a.title LIKE '%` + keyWord + `%' OR  a.body LIKE '%` + keyWord + `%' OR  a.annotation LIKE '%` + keyWord + `%' OR  a.abstract LIKE '%` + keyWord + `%') AND a.publish_status = 1 `
+		if articleType == 1 {
+			condition = `  AND ( a.title LIKE '%` + keyWord + `%' OR  a.body LIKE '%` + keyWord + `%' OR  a.annotation LIKE '%` + keyWord + `%' OR  a.abstract LIKE '%` + keyWord + `%') AND a.publish_status = 1  AND a.article_type_id NOT IN (` + articleTypeIds + `)  `
+			total, err = models.GetReoprtSearchCountHz(condition)
+		} else {
+			condition = `  AND ( a.title LIKE '%` + keyWord + `%' OR  a.body LIKE '%` + keyWord + `%' OR  a.annotation LIKE '%` + keyWord + `%' OR  a.abstract LIKE '%` + keyWord + `%') AND a.publish_status = 1  AND a.article_type_id  IN (` + articleTypeIds + `)  `
+			total, err = models.GetReoprtSearchCountYx(condition)
+		}
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.Msg = "获取总数失败，Err:" + err.Error()
+			return
+		}
+		var list []*models.ArticleListResp
+		//list := new([]models.ArticleResearchResp)
+		if articleType == 1 {
+			list, err = models.GetArticleResearchListHz(condition, pars, startSize, pageSize, user.UserId)
+		} else {
+			list, err = models.GetArticleResearchList(condition, pars, startSize, pageSize, user.UserId)
+		}
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
+			return
+		}
+		//return
+		list, err = services.HandleArticleCategoryImg(list, user)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "HandleArticleCategoryImg,Err:" + err.Error()
+			return
+		}
 
+		for _, v := range list {
+			item := models.ArticleResearchResp{
+				ArticleId:       v.ArticleId,
+				ArticleTypeId:   v.ArticleTypeId,
+				Title:           v.Title,
+				PublishDate:     v.PublishDate,
+				DepartmentId:    v.DepartmentId,
+				NickName:        v.NickName,
+				IsCollect:       v.IsCollect,
+				Pv:              v.Pv,
+				CollectNum:      v.CollectNum,
+				Abstract:        v.Abstract,
+				Annotation:      v.Annotation,
+				ImgUrlPc:        v.ImgUrlPc,
+				ArticleTypeName: nameMap[v.ArticleTypeId],
+				ButtonStyle:     styleMap[v.ArticleTypeId],
+				List:            v.List,
+			}
+			if articleType == 1 {
+				resp.ListHz = append(resp.ListHz, &item)
+			} else {
+				resp.ListYx = append(resp.ListYx, &item)
+			}
+		}
 	}
-	//for k, _ := range listHz {
-	//	listHz[k].Source = 1
-	//}
-	//var articleIds string
-	//for _, v := range listHz {
-	//	articleIds += strconv.Itoa(v.ArticleId) + ","
-	//}
-	//articleIds = strings.TrimRight(articleIds, ",")
-	//silcearticleIds := strings.Split(articleIds, ",")
-	////获取文章关联的产业
-	//var pars []interface{}
-	//pars = make([]interface{}, 0)
-	//articleIdList := make([]string, 0)
-	//for _, v := range silcearticleIds {
-	//	articleIdList = append(articleIdList, v)
-	//}
-	//condition = ` AND mg.article_id IN (  ` + utils.GetOrmInReplace(len(silcearticleIds)) + ` )  `
-	//pars = append(pars, articleIdList)
-	//industrialList, err := models.GetIndustrialListByarticleId(pars, condition)
-	//if err != nil {
-	//	br.Msg = "获取失败"
-	//	br.ErrMsg = "获取失败，GetSubjectList Err:" + err.Error()
-	//	return
-	//}
-	//industrialMap := make(map[int][]*models.IndustrialManagementResp)
-	//if len(industrialList) > 0 {
-	//	for _, v := range industrialList {
-	//		item := new(models.IndustrialManagementResp)
-	//		//item.ArticleId = v.ArticleId
-	//		item.IndustrialManagementId = v.IndustrialManagementId
-	//		item.IndustryName = v.IndustryName
-	//		item.ChartPermissionId = v.ChartPermissionId
-	//		industrialMap[v.ArticleId] = append(industrialMap[v.ArticleId], item)
-	//	}
-	//}
-	//
-	//detailCategoryUrl, err := models.GetConfigByCode("category_map_img_url")
-	//if err != nil {
-	//	br.Msg = "获取数据失败"
-	//	br.ErrMsg = "行业配置信息失败，Err:" + err.Error()
-	//	return
-	//}
-	//categoryUrlList := strings.Split(detailCategoryUrl.ConfigValue, "{|}")
-	//mapCategoryUrl := make(map[string]string)
-	//var categoryId string
-	//var imgUrlChart string
-	//for _, v := range categoryUrlList {
-	//	vslice := strings.Split(v, "_")
-	//	categoryId = vslice[0]
-	//	imgUrlChart = vslice[len(vslice)-1]
-	//	mapCategoryUrl[categoryId] = imgUrlChart
-	//}
-	//
-	//for k, v := range listHz {
-	//	if len(industrialMap[v.ArticleId]) > 0 {
-	//		listHz[k].List = industrialMap[v.ArticleId]
-	//	} else {
-	//		listHz[k].List = make([]*models.IndustrialManagementResp, 0)
-	//	}
-	//	listHz[k].Body = ""
-	//	listHz[k].Abstract, _ = services.GetReportContentTextSub(v.Abstract)
-	//	listHz[k].Annotation, _ = services.GetReportContentTextSub(v.Annotation)
-	//	//行业比较研究、资金流向，显示报告的摘要
-	//	if listHz[k].CategoryName == "行业比较研究" || listHz[k].CategoryName == "资金流向" {
-	//		listHz[k].Annotation = listHz[k].Abstract
-	//	}
-	//	listHz[k].ImgUrlPc = mapCategoryUrl[v.CategoryId]
-	//}
 
 	if keyWord != "" {
 		go services.AddUserSearchLog(user, keyWord, 5)