Merge branch 'feature/v4.8.36' into dev/v4.8.36_rjj

src/jfw/front/classificationTag.go

@@ -69,7 +69,7 @@ func HotSubjectMatter() []map[string]interface{} {
 }
 
 // 随机展示200中标企业
-func GetWinnerName() (data []map[string]interface{}) {
+func GetWinnerInfo() (data []BuyerList) {
 	randGen := rand.New(rand.NewSource(time.Now().UnixNano()))
 	from := randGen.Intn(100)
 
@@ -77,8 +77,11 @@ func GetWinnerName() (data []map[string]interface{}) {
 	r := elastic.Get("winner", "winner", fmt.Sprintf(`{"query": {"bool": {"must": []}},"_source": ["_id","name"],"from": %d,"size": 200}`, from))
 	if r != nil {
 		for _, v := range *r {
-			v["_id"] = encrypt.EncodeArticleId2ByCheck(qu.InterfaceToStr(v["_id"]))
-			data = append(data, v)
+			var vs BuyerList
+			id := encrypt.EncodeArticleId2ByCheck(qu.InterfaceToStr(v["_id"]))
+			vs.Name = qu.InterfaceToStr(v["name"])
+			vs.Url = fmt.Sprintf("/swordfish/page_big_pc/ent_portrait/%s", id)
+			data = append(data, vs)
 		}
 	}
 	return

src/jfw/front/tags.go

@@ -724,7 +724,8 @@ func (this *Tags) GetInsturyKeywords(idstr string) (name, class_1, class_2 strin
 // p353包含采购意向与拟建
 func (this *Tags) GetInfoType(idstr string) (string, string) {
 	if idstr == "all" {
-		return "拟建,采购意向,招标,邀标,询价,竞谈,单一,竞价,变更,中标,成交,废标,流标,合同,验收,违规,预告,需求公示,预审,论证意见,预审结果", ""
+		//return "招标,邀标,询价,竞谈,单一,竞价,变更,中标,成交,废标,流标,合同,验收,违规,预告,需求公示,预审,论证意见,预审结果", ""
+		return "", ""
 	}
 	id, _ := strconv.Atoi(idstr)
 	data := public.BaseMysql.SelectBySql(`select id,name from seo_words.seo_stype where id =?`, id)