|
@@ -234,6 +234,11 @@ func UtilEsFind1(tags map[string]interface{}) (error, int64) {
|
|
|
} else {
|
|
|
log.Println("id", item["info_id"], "bidding为空")
|
|
|
}
|
|
|
+ //项目id
|
|
|
+ projectId := GetProjectId(info_id)
|
|
|
+ if projectId != "" {
|
|
|
+ item["projectId"] = SE2.EncodeString(projectId)
|
|
|
+ }
|
|
|
datas = append(datas, item)
|
|
|
} else {
|
|
|
log.Println("id", item["_id"], "信息为空")
|
|
@@ -899,3 +904,21 @@ func KeyWordToData(types, item, key string, keyWord []string) []string {
|
|
|
}
|
|
|
return keyWord
|
|
|
}
|
|
|
+
|
|
|
+func GetProjectId(id string) string {
|
|
|
+ query := `{"query": {"bool": {"must": [{"term": {"projectset.ids": "%s"}}],"must_not": [],"should": []}}}`
|
|
|
+ querys := fmt.Sprintf(query, id)
|
|
|
+ projectId := ""
|
|
|
+ projectIdArr := []string{}
|
|
|
+ data := Es.Get("projectset", "projectset", querys)
|
|
|
+ if data != nil && *data != nil && len(*data) > 0 {
|
|
|
+ for _, v := range *data {
|
|
|
+ projectIdArr = append(projectIdArr, util.ObjToString(v["_id"]))
|
|
|
+ }
|
|
|
+ projectId = strings.Join(projectIdArr, ",")
|
|
|
+ log.Println("projectId", projectId)
|
|
|
+ } else {
|
|
|
+ log.Println("ES未查到项目id", id)
|
|
|
+ }
|
|
|
+ return projectId
|
|
|
+}
|