|
@@ -12,6 +12,7 @@ import (
|
|
|
. "mongodb"
|
|
|
"net/url"
|
|
|
"qfw/util"
|
|
|
+ "qfw/util/elastic"
|
|
|
|
|
|
"qfw/util/jy"
|
|
|
"qfw/util/redis"
|
|
@@ -365,28 +366,34 @@ func (s *Short) Article(stype, id string) error {
|
|
|
s.SetSession("projectname", obj["projectname"])
|
|
|
}
|
|
|
if obj["entidlist"] != nil { //大会员中标企业跳转至画像
|
|
|
- winner := util.ObjToString(obj["winner"])
|
|
|
- s_winner := util.ObjToString(obj["s_winner"])
|
|
|
- idObjs, _ := obj["entidlist"].([]interface{})
|
|
|
- winnerId := ""
|
|
|
- if names := strings.Split(s_winner, ","); len(names) > 1 {
|
|
|
- index := 0
|
|
|
- for i := 0; i < len(names); i++ {
|
|
|
- if names[i] == winner {
|
|
|
- index = i
|
|
|
- break
|
|
|
- }
|
|
|
- }
|
|
|
- if len(idObjs) > index {
|
|
|
- winnerId = util.ObjToString(idObjs[index])
|
|
|
+ if winner := util.ObjToString(obj["winner"]); winner != "" {
|
|
|
+ //临时更改为企业名称查询企业id
|
|
|
+ rData := elastic.Get("qyxy", "qyxy", fmt.Sprintf(`{"query":{"bool":{"should":[{"term":{"company_name":%s}},{"term":{"hname":%s}}],"minimum_should_match":1}},"_source":["name","_id","capital","company_phone"],"size":1}`, winner, winner))
|
|
|
+ if rData != nil && len(*rData) == 1 {
|
|
|
+ obj["entId"] = util.ObjToString((*rData)[0]["_id"])
|
|
|
}
|
|
|
- } else { //中标企业仅一个
|
|
|
- if len(idObjs) > 0 {
|
|
|
- winnerId = util.ObjToString(idObjs[0])
|
|
|
- }
|
|
|
- }
|
|
|
- if winnerId != "" {
|
|
|
- obj["entId"] = util.EncodeArticleId2ByCheck(winnerId)
|
|
|
+ //s_winner := util.ObjToString(obj["s_winner"])
|
|
|
+ //idObjs, _ := obj["entidlist"].([]interface{})
|
|
|
+ //winnerId := ""
|
|
|
+ //if names := strings.Split(s_winner, ","); len(names) > 1 {
|
|
|
+ // index := 0
|
|
|
+ // for i := 0; i < len(names); i++ {
|
|
|
+ // if names[i] == winner {
|
|
|
+ // index = i
|
|
|
+ // break
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // if len(idObjs) > index {
|
|
|
+ // winnerId = util.ObjToString(idObjs[index])
|
|
|
+ // }
|
|
|
+ //} else { //中标企业仅一个
|
|
|
+ // if len(idObjs) > 0 {
|
|
|
+ // winnerId = util.ObjToString(idObjs[0])
|
|
|
+ // }
|
|
|
+ //}
|
|
|
+ //if winnerId != "" {
|
|
|
+ // obj["entId"] = util.EncodeArticleId2ByCheck(winnerId)
|
|
|
+ //}
|
|
|
}
|
|
|
}
|
|
|
|