合并细节

udpfilterdup/src/main.go

@@ -106,9 +106,11 @@ func mainT() {
 	/*
 	ObjectId("5da3f31aa5cb26b9b798d3aa")
 	ObjectId("5da418c4a5cb26b9b7e3e9a6")
+	ObjectId("5df5071ce9d1f601e495fa54")
+	ObjectId("5e09c05f0cf41612e0626abc")
 	*/
-	//sid = "5da3f31aa5cb26b9b798d3aa"
-	//eid = "5da418c4a5cb26b9b7e3e9a6"
+	//sid = "5df5071ce9d1f601e495fa50"
+	//eid = "5e09c05f0cf41612e0626abc"
 
 	mapinfo := map[string]interface{}{}
 	if sid == "" || eid == "" {
@@ -648,8 +650,8 @@ func mergeDataFields(source *Info, info *Info) (*Info, []int64,bool) {
 	is_replace :=false
 	//1、城市
 	if (source.area == "" || source.area == "全国") && info.area != "全国" && info.area != "" {
-		merge_recordMap["area"] = info.area
-		merge_recordMap["city"] = info.city
+		merge_recordMap["area"] = source.area
+		merge_recordMap["city"] = source.city
 		source.area = info.area
 		source.city = info.city
 		mergeArr = append(mergeArr, 1)
@@ -657,49 +659,49 @@ func mergeDataFields(source *Info, info *Info) (*Info, []int64,bool) {
 	}
 	//2、项目名称
 	if source.projectname == "" && info.projectname != "" {
-		merge_recordMap["projectname"] = info.projectname
+		merge_recordMap["projectname"] = source.projectname
 		source.projectname = info.projectname
 		mergeArr = append(mergeArr, 2)
 		is_replace = true
 	}
 	//3、项目编号
 	if source.projectcode == "" && info.projectcode != "" {
-		merge_recordMap["projectcode"] = info.projectcode
+		merge_recordMap["projectcode"] = source.projectcode
 		source.projectcode = info.projectcode
 		mergeArr = append(mergeArr, 3)
 		is_replace = true
 	}
 	//4、采购单位
 	if source.buyer == "" && info.buyer != "" {
-		merge_recordMap["buyer"] = info.buyer
+		merge_recordMap["buyer"] = source.buyer
 		source.buyer = info.buyer
 		mergeArr = append(mergeArr, 4)
 		is_replace = true
 	}
 	//5、预算
 	if source.budget == 0 && info.budget != 0 {
-		merge_recordMap["budget"] = info.budget
+		merge_recordMap["budget"] = source.budget
 		source.budget = info.budget
 		mergeArr = append(mergeArr, 5)
 		is_replace = true
 	}
 	//6、中标单位
 	if source.winner == "" && info.winner != "" {
-		merge_recordMap["winner"] = info.winner
+		merge_recordMap["winner"] = source.winner
 		source.winner = info.winner
 		mergeArr = append(mergeArr, 6)
 		is_replace = true
 	}
 	//7、中标金额
 	if source.bidamount == 0 && info.bidamount != 0 {
-		merge_recordMap["bidamount"] = info.bidamount
+		merge_recordMap["bidamount"] = source.bidamount
 		source.bidamount = info.bidamount
 		mergeArr = append(mergeArr, 7)
 		is_replace = true
 	}
 	//8、开标时间-地点
 	if source.bidopentime == 0 && info.bidopentime != 0 {
-		merge_recordMap["bidopentime"] = info.bidopentime
+		merge_recordMap["bidopentime"] = source.bidopentime
 		source.bidopentime = info.bidopentime
 		mergeArr = append(mergeArr, 8)
 		is_replace = true
@@ -707,7 +709,7 @@ func mergeDataFields(source *Info, info *Info) (*Info, []int64,bool) {
 
 	//9、合同编号
 	if source.contractnumber == "" && info.contractnumber != "" {
-		merge_recordMap["contractnumber"] = info.contractnumber
+		merge_recordMap["contractnumber"] = source.contractnumber
 		source.contractnumber = info.contractnumber
 		mergeArr = append(mergeArr, 9)
 		is_replace = true