企业信息匹配修改

customerdata/src/util.go

@@ -60,7 +60,7 @@ func GetNotkeyAndKeyAddWord(list primitive.A, fieldMap map[string]interface{}, h
 					tmp_nkw := nkw_addArr[0]
 					if tmp_nkw != "" {
 						cr := &CommonReg{}
-						cr.CsVal = tmp_nkw                   //记录原值
+						cr.CsVal = tmp_nkw //记录原值
 						if LetterCase.MatchString(tmp_nkw) { //判断附加词中是否有英文
 							tmp_nkw = strings.ToUpper(tmp_nkw) //附加词中有英文全部转为大写
 							cr.IsLetter = true                 //含字母
@@ -112,7 +112,7 @@ func GetNotkeyAndKeyAddWord(list primitive.A, fieldMap map[string]interface{}, h
 				tmp_aw := aw_addArr[0]
 				if tmp_aw != "" {
 					cr := &CommonReg{}
-					cr.CsVal = tmp_aw                   //记录原值
+					cr.CsVal = tmp_aw //记录原值
 					if LetterCase.MatchString(tmp_aw) { //判断附加词中是否有英文
 						tmp_aw = strings.ToUpper(tmp_aw) //附加词中有英文全部转为大写
 						cr.IsLetter = true               //含字母
@@ -518,14 +518,14 @@ func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, a
 					packages := (datas)["package"].(map[string]interface{})
 					for _, vv := range packages {
 						vs := vv.(map[string]interface{})
-						if qu.ObjToString(tmp["toptype"]) == "结果" || qu.ObjToString(tmp["toptype"]) == "其它" {
+						if qu.ObjToString(tmp["toptype"]) == "结果" || qu.ObjToString(tmp["toptype"]) == "其它" || qu.ObjToString(tmp["toptype"]) == "单一" {
 							if vs["winner"] != nil && qu.ObjToString(vs["winner"]) != "" {
 								winner := strings.Split(qu.ObjToString(vs["winner"]), ",")
-								delete(tmp,"legal_person")
-								delete(tmp,"company_address")
-								delete(tmp,"winner_credit_no")
-								delete(tmp,"company_email")
-								delete(tmp,"company_phone")
+								delete(tmp, "legal_person")
+								delete(tmp, "company_address")
+								delete(tmp, "winner_credit_no")
+								delete(tmp, "company_email")
+								delete(tmp, "company_phone")
 								for _, w := range winner {
 									// if MactchWinner(w) {
 									if index > 1 {

src/history/util_history.go

@@ -516,14 +516,9 @@ func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, h
 					packages := (datas)["package"].(map[string]interface{})
 					for _, vv := range packages {
 						vs := vv.(map[string]interface{})
-						if qu.ObjToString(tmp["toptype"]) == "结果" || qu.ObjToString(tmp["toptype"]) == "其它" {
+						if qu.ObjToString(tmp["toptype"]) == "结果" || qu.ObjToString(tmp["toptype"]) == "其它" || qu.ObjToString(tmp["toptype"]) == "单一" {
 							if vs["winner"] != nil && qu.ObjToString(vs["winner"]) != "" {
 								winner := strings.Split(qu.ObjToString(vs["winner"]), ",")
-								delete(tmp,"legal_person")
-								delete(tmp,"company_address")
-								delete(tmp,"winner_credit_no")
-								delete(tmp,"company_email")
-								delete(tmp,"company_phone")
 								for _, w := range winner {
 									// if MactchWinner(w) {
 									if index > 1 {
@@ -531,6 +526,11 @@ func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, h
 										for ks, vks := range tmp {
 											s_data[ks] = vks
 										}
+										delete(s_data,"legal_person")
+										delete(s_data,"company_address")
+										delete(s_data,"winner_credit_no")
+										delete(s_data,"company_email")
+										delete(s_data,"company_phone")
 										s_data["s_winner"] = w
 										SearchEnterpriseInfos(s_data, w)
 										GetWinnerType(w, s_data)
@@ -547,6 +547,11 @@ func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, h
 										log.Println("index", index, " ", id, " ", w)
 									} else {
 										tmp["s_winner"] = w
+										delete(tmp,"legal_person")
+										delete(tmp,"company_address")
+										delete(tmp,"winner_credit_no")
+										delete(tmp,"company_email")
+										delete(tmp,"company_phone")
 										SearchEnterpriseInfos(tmp, w)
 										GetWinnerType(w, tmp)
 										if vs["bidamount"] != nil {

src/util/utiltag.go

@@ -522,7 +522,7 @@ func method1(newEsObject sql.NewEsObject, keyword, keymatch string, tmps []strin
 		if vv == "" {
 			continue
 		}
-		log.Println(vv, tmps, keymatch)
+		//log.Println(vv, tmps, keymatch)
 		if len(tmps) == 1 && (strings.Contains(keymatch, "8") || strings.Contains(keymatch, "9")) {
 			//中标单位、采购单位、中标单位(正则)、采购单位(正则)    单选
 			strs := ""
@@ -554,7 +554,7 @@ func method1(newEsObject sql.NewEsObject, keyword, keymatch string, tmps []strin
 			keywordArr = append(keywordArr, addkeylines[0])
 		} else {
 			addkeylines := strings.Split(vv, "&&")
-			log.Println(addkeylines, "addkeylines")
+			//log.Println(addkeylines, "addkeylines")
 			if len(addkeylines) > 1 {
 				addkeyline := sql.NewEsObject{}
 				for _, vvv := range addkeylines {