潜在竞争对手

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

@@ -105,9 +105,8 @@ func GetEntInfo(entName []string, p string) (entName_r []*EnterQYXYInfo) {
 }
 
 //企业库是否有此企业信息
-func GetEntInfoByQYXY(entName []string, p string) []EnterQYXYInfo {
-	entName_r := []EnterQYXYInfo{}
-	entInfo := EnterQYXYInfo{}
+func GetEntInfoByQYXY(entName []string, p string) []*EnterQYXYInfo {
+	entName_r := []*EnterQYXYInfo{}
 	if len(entName) > 0 {
 		query := map[string]interface{}{}
 		if p == "C" {
@@ -124,11 +123,12 @@ func GetEntInfoByQYXY(entName []string, p string) []EnterQYXYInfo {
 		it := sess.DB(db.Mgo_Ent.DbName).C("qyxy_std").Find(query).Select(map[string]interface{}{"company_name": 1, "_id": 1, "company_area": 1, "company_city": 1}).Iter()
 		for m := make(map[string]interface{}); it.Next(&m); {
 			if m["company_name"] != nil && m["company_name"].(string) != "" {
-				entInfo.Id = m["_id"].(string)
-				entInfo.Name = qutil.ObjToString(m["company_name"])
-				entInfo.Area = qutil.ObjToString(m["company_area"])
-				entInfo.City = qutil.ObjToString(m["company_city"])
-				entName_r = append(entName_r, entInfo)
+				entName_r = append(entName_r, &EnterQYXYInfo{
+					Id:   m["_id"].(string),
+					Name: qutil.ObjToString(m["company_name"]),
+					Area: qutil.ObjToString(m["company_area"]),
+					City: qutil.ObjToString(m["company_city"]),
+				})
 			}
 		}
 	}

src/jfw/modules/bigmember/src/service/analysis/potential.go

@@ -658,8 +658,8 @@ func analysisDataByBuyer(res []map[string]interface{}, mycs map[string]interface
 	var ADRes_r = []*PTComs{}
 	var enters = []string{}
 	var EnterPOC = map[string]PCInfo{}
-	var EnterQYXY = []entity.EnterQYXYInfo{} //企业信用是否有此企业数据
-	var EnterQYXY_map = map[string]string{}  //企业信用是否有此企业数据
+	var EnterQYXY = []*entity.EnterQYXYInfo{} //企业信用是否有此企业数据
+	var EnterQYXY_map = map[string]string{}   //企业信用是否有此企业数据
 	var wg sync.WaitGroup
 	var entersFifty = []string{}
 	for k, v := range res {
@@ -674,14 +674,14 @@ func analysisDataByBuyer(res []map[string]interface{}, mycs map[string]interface
 		}
 		if isContinue {
 			//防止最后一个企业不匹配  直接跳出
-			if len(res) == k+1 {
-				wg.Add(1)
-				go func(entersFifty []string) {
-					EnterQYXY = append(EnterQYXY, entity.GetEntInfoByQYXY(entersFifty, "C")...)
-					wg.Done()
-				}(entersFifty)
-				entersFifty = []string{}
-			}
+			// if len(res) == k+1 {
+			// 	wg.Add(1)
+			// 	go func(entersFifty []string) {
+			// 		EnterQYXY = append(EnterQYXY, entity.GetEntInfoByQYXY(entersFifty, "C")...)
+			// 		wg.Done()
+			// 	}(entersFifty)
+			// 	entersFifty = []string{}
+			// }
 			continue
 		}
 		var budget_val = qutil.ObjToMap(v["count"])  //预算总金额
@@ -730,8 +730,8 @@ func analysisDataByBuyer(res []map[string]interface{}, mycs map[string]interface
 	}
 	wg.Wait()
 	for _, ev := range EnterQYXY {
-		if ev.Name != "" {
-			EnterQYXY_map[ev.Name] = ev.Id
+		if (*ev).Name != "" {
+			EnterQYXY_map[(*ev).Name] = (*ev).Id
 		}
 	}
 	for _, vv := range ADRes {
@@ -753,7 +753,7 @@ func analysisDataByWinner(res []map[string]interface{}, mycs map[string]interfac
 	var ADRes = []*PTComs{}
 	var ADRes_r = []*PTComs{}
 	var enters = []string{}
-	var EnterQYXY = []entity.EnterQYXYInfo{}              //企业信用是否有此企业数据
+	var EnterQYXY = []*entity.EnterQYXYInfo{}             //企业信用是否有此企业数据
 	var EnterQYXY_map = map[string]entity.EnterQYXYInfo{} //企业信用是否有此企业数据
 	var wg sync.WaitGroup
 	var entersFifty = []string{}
@@ -773,14 +773,14 @@ func analysisDataByWinner(res []map[string]interface{}, mycs map[string]interfac
 		}
 		if isContinue {
 			//防止最后一个企业不匹配  直接跳出
-			if len(res) == k+1 {
-				wg.Add(1)
-				go func(entersFifty []string, pcor string) {
-					EnterQYXY = append(EnterQYXY, entity.GetEntInfoByQYXY(entersFifty, pcor)...)
-					wg.Done()
-				}(entersFifty, pcor)
-				entersFifty = []string{}
-			}
+			// if len(res) == k+1 {
+			// 	wg.Add(1)
+			// 	go func(entersFifty []string, pcor string) {
+			// 		EnterQYXY = append(EnterQYXY, entity.GetEntInfoByQYXY(entersFifty, pcor)...)
+			// 		wg.Done()
+			// 	}(entersFifty, pcor)
+			// 	entersFifty = []string{}
+			// }
 			continue
 		}
 		var budget_val = qutil.ObjToMap(v["count"])  //预算总金额
@@ -804,12 +804,12 @@ func analysisDataByWinner(res []map[string]interface{}, mycs map[string]interfac
 	}
 	wg.Wait()
 	for _, ev := range EnterQYXY {
-		if ev.Name != "" {
+		if (*ev).Name != "" {
 			EnterQYXY_map[ev.Id] = entity.EnterQYXYInfo{
-				Id:   ev.Id,
-				Name: ev.Name,
-				Area: ev.Area,
-				City: ev.City,
+				Id:   (*ev).Id,
+				Name: (*ev).Name,
+				Area: (*ev).Area,
+				City: (*ev).City,
 			}
 		}
 	}