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

fullproject/src_v1/merge_comparepnc.go

@@ -17,6 +17,14 @@ func comparePNC(info *Info, compareProject *ProjectInfo) (compareStr string, sco
 		}
 		ifind := 0
 		templen := 0
+		buyer := info.Buyer
+		if buyer == "" {
+			buyer = compareProject.Buyer
+		}
+		pn := info.ProjectName
+		if buyer != "" {
+			pn = strings.Replace(pn, buyer, "", -1)
+		}
 		for _, v := range pns {
 			if info.ProjectName == v {
 				ifind = 1
@@ -28,7 +36,10 @@ func comparePNC(info *Info, compareProject *ProjectInfo) (compareStr string, sco
 					ifind = 1
 					break
 				} else {
-					v1 := CosineSimilar(info.ProjectName, v)
+					if buyer != "" {
+						v = strings.Replace(v, buyer, "", -1)
+					}
+					v1 := CosineSimilar(pn, v)
 					if retv == 2 || v1 > 0.81 {
 						templen = len([]rune(v))
 						ifind = 2