xiugai

src/history/util_history.go

@@ -34,6 +34,8 @@ var MatchType = map[string]interface{}{
 	"5": "projectname",
 	"6": "buyer",
 	"7": "s_winner",
+	"8": "buyer",
+	"9": "s_winner",
 }
 
 //加载排除词、附加词、关键词
@@ -44,8 +46,6 @@ func GetNotkeyAndKeyAddWord(list []map[string]interface{}, fieldMap map[string]i
 		if hasNotKey { //是否处理排除词
 			//排除词匹配方式
 			nkm := qu.ObjToString(ruleMap["s_notkeymatch"])
-			nkm = strings.ReplaceAll(nkm, "8", "6")
-			nkm = strings.ReplaceAll(nkm, "9", "7")
 			nkmArr := []string{}
 			for _, nv := range strings.Split(nkm, ",") {
 				if field := qu.ObjToString(MatchType[nv]); field != "" {
@@ -65,7 +65,7 @@ func GetNotkeyAndKeyAddWord(list []map[string]interface{}, fieldMap map[string]i
 					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                 //含字母
@@ -98,8 +98,6 @@ func GetNotkeyAndKeyAddWord(list []map[string]interface{}, fieldMap map[string]i
 		}
 		//附加词匹配方式
 		awm := qu.ObjToString(ruleMap["s_addkeymatch"])
-		awm = strings.ReplaceAll(awm, "8", "6")
-		awm = strings.ReplaceAll(awm, "9", "7")
 		awmArr := []string{}
 		for _, av := range strings.Split(awm, ",") {
 			if field := qu.ObjToString(MatchType[av]); field != "" {
@@ -119,7 +117,7 @@ func GetNotkeyAndKeyAddWord(list []map[string]interface{}, fieldMap map[string]i
 				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               //含字母
@@ -148,8 +146,6 @@ func GetNotkeyAndKeyAddWord(list []map[string]interface{}, fieldMap map[string]i
 		aws = append(aws, aw)
 		//关键词匹配方式
 		kwm := qu.ObjToString(ruleMap["s_keymatch"])
-		kwm = strings.ReplaceAll(kwm, "8", "6")
-		kwm = strings.ReplaceAll(kwm, "9", "7")
 		kwmArr := []string{}
 		for _, kv := range strings.Split(kwm, ",") {
 			if field := qu.ObjToString(MatchType[kv]); field != "" {
@@ -1143,7 +1139,7 @@ func GetXlsxs(mMap []map[string]interface{}, fn, email, id string, isfile, isHen
 					row.AddCell().SetValue(v["projectname"]) //项目名称
 					row.AddCell().SetValue(v["buyer"])       //采购单位
 					row.AddCell().SetValue(v[""])            //采购单位类别---私有标签tagname
-					if v["bidamount"] != nil { //中标金额
+					if v["bidamount"] != nil {               //中标金额
 						row.AddCell().SetFloat(qu.Float64All(v["bidamount"]))
 					} else {
 						row.AddCell()