Merge branch 'dev_v1.0.1_wh' of CRM/application into feature/v1.0.1

api/internal/service/employService.go

@@ -22,6 +22,8 @@ import (
 const (
 	BuyerIndex = "buyer" // 采购单位index
 	BuyerType  = "buyer"
+	INDEX      = "bidding"
+	TYPE       = "bidding"
 )
 
 type EmPloyService struct{}
@@ -212,7 +214,7 @@ func infoFind(id string, v1 string) map[string]interface{} {
 	//ownerclass  业主类型(拟在建搜索) expurasing_time 预计采购时间   jybx_url 标讯详情页
 	//标讯信息
 	obj := map[string]interface{}{}
-	brobj, ok := MC.Mgo.Find("bidding_rec", bson.M{"s_id": id}, `{"l_recoverydate":-1}`, public.MgoBiddingFields, false, 0, 1)
+	/*brobj, ok := MC.Mgo.Find("bidding_rec", bson.M{"s_id": id}, `{"l_recoverydate":-1}`, public.MgoBiddingFields, false, 0, 1)
 	if ok && (*brobj) != nil && len(*brobj) == 1 && (*brobj)[0] != nil {
 		obj = (*brobj)[0]
 	} else {
@@ -221,11 +223,15 @@ func infoFind(id string, v1 string) map[string]interface{} {
 			aobj, ok = MC.MgoBidding.FindById("bidding_back", id, public.MgoBiddingFields)
 		}
 		obj = *aobj
+	}*/
+	aobj := elastic.Get(INDEX, TYPE, fmt.Sprintf(`{"query":{"bool":{"must":[{"match":{"id":"%s"}}],"must_not":[],"should":[]}},"from":0,"size":10,"_source":["_id","purchasinglist","projectname","projectcode","title","s_winner","buyertel","bidstatus","site","bidamount","toptype","winneraddr","winner","agency","buyer","detail","city","subtype","buyerclass","href","comeintime","winnertel","area","publishtime","buyeraddr","agencytel","budget","entidlist","buyerperson","winnerperson","agencyaddr","recommended_service","competehref","owner","total_investment","projectaddr","projectperiod","approvedept","approvecontent","approvecode","approvenumber","approvetime","approvestatus","project_scale"],"sort":[],"aggs":{}}`, id))
+	if aobj != nil || *aobj != nil || len(*aobj) > 0 {
+		obj = (*aobj)[0]
 	}
 	toptype := common.InterfaceToStr(obj["toptype"])
 	subtype := common.InterfaceToStr(obj["subtype"])
 	pushTime := ""
-	if ok && obj != nil && len(obj) > 0 {
+	if obj != nil && len(obj) > 0 {
 		data["title"] = common.ObjToString(obj["title"])
 		data["city"] = obj["city"]
 		data["area"] = obj["area"]