Merge branch 'dev3.4' of http://192.168.3.207:10080/qmx/jy-data-extract into dev3.4

udpcreateindex/src/projectindex.go

@@ -23,6 +23,15 @@ func projectTask(data []byte, project, mapInfo map[string]interface{}) {
 				"$lte": util.StringTOBsonId(mapInfo["lteid"].(string)),
 			},
 		}
+	} else {
+		idMap := q["_id"].(map[string]interface{})
+		tmpQ := map[string]interface{}{}
+		for c, id := range idMap {
+			if idStr, ok := id.(string); ok && id != "" {
+				tmpQ[c] = util.StringTOBsonId(idStr)
+			}
+		}
+		q["_id"] = tmpQ
 	}
 	var session *mgov.Session
 	if project["addr"] != nil {

udpcreateindex/src/winnerextract.go

@@ -76,7 +76,7 @@ func winnerEsTaskOnce() {
 	num_2 := 0
 	for tmp := make(map[string]interface{}); it_2.Next(&tmp); num_2++ {
 		if num_2%100 == 0 && num_2 > 0 {
-			log.Println("当前表:", win_enterr, "数量:", num_1)
+			log.Println("当前表:", win_enterr, "数量:", num_2)
 		}
 		pool <- true
 		wg.Add(1)