feat:项目中标企业

src/jfw/modules/bigmember/src/entity/followProject.go

@@ -217,7 +217,6 @@ func (this *ProjectFollow) GetDetailByFid(fid string) (returnData map[string]int
 	returnData["visit"] = strings.Split(visit, ",")      //是否开启提醒
 	returnData["bidopentime"] = (*data)["l_bidopentime"] //开标时间
 	returnData["remindtime"] = (*data)["l_remindtime"]   //提醒时间
-	returnData["s_winner"] = (*data)["s_winner"]         //中标企业
 	if qutil.ObjToString((*data)["s_id"]) == "" {        //兼容旧版本手动添加的关注
 		projectInfo = map[string]interface{}{
 			"projectname": (*data)["s_projectname"],
@@ -251,7 +250,7 @@ func (this *ProjectFollow) GetProjectDetailBySid(sid string) (res map[string]int
 		}
 		log.Printf("ProjectFollow GetProjectDetailBySid Unmarshal err %v\n", err)
 	}
-	list := elastic.Get("projectset", "projectset", `{"query": {"bool": {"must": [{"match": {"list.infoid": "`+sid+`"}}]}},"_source":["list","projectcode","projectname","bidopentime","area","city","agency","buyer","buyerperson","buyertel","bidstatus","s_winner"],"from": 0,"size": 1}`)
+	list := elastic.Get("projectset", "projectset", `{"query": {"bool": {"must": [{"match": {"list.infoid": "`+sid+`"}}]}},"_source":["list","projectcode","projectname","bidopentime","area","city","agency","buyer","buyerperson","buyertel","bidstatus","winner"],"from": 0,"size": 1}`)
 	if len(*list) == 0 {
 		return nil, errors.New("没有找到项目信息")
 	}
@@ -280,6 +279,10 @@ func (this *ProjectFollow) GetProjectDetailBySid(sid string) (res map[string]int
 			})
 		}
 	}
+	if finalDate["winner"] != nil {
+		finalDate["s_winner"] = finalDate["winner"]
+		delete(finalDate, "winner")
+	}
 	finalDate["list"] = thisList
 	//redis缓存一星期
 	redis.Put("other", redisKey, &finalDate, 60*60*5)

src/jfw/modules/bigmember/src/service/follow/project.go

@@ -3,6 +3,7 @@ package follow
 import (
 	. "app.yhyue.com/moapp/jybase/api"
 	qutil "app.yhyue.com/moapp/jybase/common"
+	elastic "app.yhyue.com/moapp/jybase/es"
 	"errors"
 	"fmt"
 	"jy/src/jfw/modules/bigmember/src/entity"
@@ -211,6 +212,17 @@ func (this *FollowProject) FollowDetail() {
 	this.ServeJson(NewResult(rData, errMsg))
 }
 
+func GetWinnerFromProjectSet(sid string) (winner string) {
+	list := elastic.Get("projectset", "projectset", `{"query": {"bool": {"must": [{"match": {"list.infoid": "`+sid+`"}}]}},"_source":["winner"],"from": 0,"size": 1}`)
+	if len(*list) == 0 {
+		return
+	}
+	finalDate := (*list)[0]
+	if finalDate["winner"] != nil {
+		winner = qutil.ObjToString(finalDate["winner"])
+	}
+	return
+}
 func mergeFollowDetail(followInfo, projectInfo map[string]interface{}, sid string) (map[string]interface{}, error) {
 	//未关注查看项目信息
 	visitArr := []string{}
@@ -232,7 +244,11 @@ func mergeFollowDetail(followInfo, projectInfo map[string]interface{}, sid strin
 		}
 		delete(followInfo, "visit")
 	}
-
+	log.Println("-----:", projectInfo)
+	if projectInfo["s_winner"] == nil {
+		projectInfo["s_winner"] = GetWinnerFromProjectSet(sid)
+	}
+	log.Println("--1111---:", projectInfo)
 	infoMapArr := []map[string]interface{}{}
 	if infoArrTmp, t := projectInfo["list"].([]map[string]interface{}); t { //查库 list类型为[]map[string]interface{}
 		infoMapArr = infoArrTmp