1.中标单位

2.金额

src/jy/extract/extract.go

@@ -797,7 +797,10 @@ func ExtRuleCore(doc map[string]interface{}, e *ExtractTask, vc *RuleCore, j *ju
 				j.Result[k] = [](*ju.ExtField){}
 			}
 			for _, tmp := range v {
-				field := &ju.ExtField{Weight: qu.IntAll(tmp["weight"]), Field: k, Code: qu.ObjToString(tmp["code"]), Type: qu.ObjToString(tmp["type"]), MatchType: qu.ObjToString(tmp["matchtype"]), RuleText: qu.ObjToString(tmp["ruletext"]), SourceValue: tmp["sourcevalue"], Value: tmp["value"]}
+				field := &ju.ExtField{Weight: qu.IntAll(tmp["weight"]),ExtFrom:qu.ObjToString(tmp["extfrom"]), Field: k, Code: qu.ObjToString(tmp["code"]), Type: qu.ObjToString(tmp["type"]), MatchType: qu.ObjToString(tmp["matchtype"]), RuleText: qu.ObjToString(tmp["ruletext"]), SourceValue: tmp["sourcevalue"], Value: tmp["value"]}
+				if k == "bidamount" && field.ExtFrom=="第一候选人"{
+					field.Score = 1
+				}
 				if isSite {
 					field.Score = 1
 				}
@@ -1038,12 +1041,15 @@ func getKvByLuaFields(vc *RuleCore, j *ju.Job, et *ExtractTask) (map[string][]ma
 	if len(j.Winnerorder) > 1 {
 		if vc.Field == "bidamount" {
 			for _, v := range j.Winnerorder {
+				if v["price"] == nil{
+					continue
+				}
 				kvmap[vc.Field] = append(kvmap[vc.Field], map[string]interface{}{
 					"code":        "winnerorder",
 					"field":       vc.Field,
 					"ruletext":    "中标候选人",
-					"extfrom":     vc.ExtFrom,
-					"sourcevalue": "中标候选人",
+					"extfrom":     v["sortstr"],
+					"sourcevalue": v["price"],
 					"value":       v["price"],
 					"type":        "winnerorder",
 					"matchtype":   "winnerorder",
@@ -1055,8 +1061,8 @@ func getKvByLuaFields(vc *RuleCore, j *ju.Job, et *ExtractTask) (map[string][]ma
 					"code":        "CL_中标候选人",
 					"field":       vc.Field,
 					"ruletext":    "中标候选人",
-					"extfrom":     vc.ExtFrom,
-					"sourcevalue": "中标候选人",
+					"extfrom":      j.Winnerorder[0]["sortstr"],
+					"sourcevalue": price,
 					"value":       price,
 					"type":        "winnerorder",
 					"matchtype":   "winnerorder",
@@ -2035,8 +2041,10 @@ func resetWinnerorder(j *ju.Job) {
 	//	}
 	//}
 	if maxlen > 0 {
-		winners = append(winners,&ju.ExtField{Code:"winnerorder",Field:"winner",ExtFrom:"j.Winnerorder",Value:j.Winnerorder[0]["entname"]} )
-		bidamounts = append(bidamounts,&ju.ExtField{Code:"winnerorder",Field:"bidamount",ExtFrom:"j.Winnerorder",Value:j.Winnerorder[0]["price"]} )
+		winners = append(winners,&ju.ExtField{Code:"winnerorder",Field:"winner",ExtFrom:"j.Winnerorder",Value:j.Winnerorder[0]["entname"],Score:0.5} )
+		if j.Winnerorder[0]["price"]!= nil{
+			bidamounts = append(bidamounts,&ju.ExtField{Code:"winnerorder",Field:"bidamount",ExtFrom:"j.Winnerorder",Value:j.Winnerorder[0]["price"],Score:0.5} )
+		}
 	}
 	if j.Result["winner"] == nil{
 		j.Result["winner"] = winners
@@ -2044,7 +2052,7 @@ func resetWinnerorder(j *ju.Job) {
 		j.Result["winner"] = append(j.Result["winner"],winners... )
 	}
 	if j.Result["bidamount"]==nil{
-		j.Result["bidamount"] = winners
+		j.Result["bidamount"] = bidamounts
 	}else {
 		j.Result["bidamount"] =  append(j.Result["bidamount"],bidamounts... )
 	}

src/jy/pretreated/spacekv.go

@@ -16,18 +16,18 @@ var (
 	excludeSpaceKey = regexp.MustCompile("[.、�\\[【{｛〔<《\\]】}｝〕>》]")
 )
 
-func (se *SpacekvEntity) Entrance(text, title string, contactFormat *util.ContactFormat,isSite bool,codeSite string) *util.JobKv {
+func (se *SpacekvEntity) Entrance(text, title string, contactFormat *util.ContactFormat, isSite bool, codeSite string) *util.JobKv {
 	lines := se.getLines(text)
 	kvMaps := []*util.Kv{}
 	for _, line := range lines {
-		kvMap := se.divideKV(line,isSite,codeSite)
+		kvMap := se.divideKV(line, isSite, codeSite)
 		if kvMap == nil {
 			continue
 		}
 		kvMaps = append(kvMaps, kvMap...)
 	}
-	FormatContactKv(&kvMaps, title, nil, contactFormat,isSite,codeSite)
-	kvTags := GetKvTags(kvMaps, title, nil,isSite,codeSite)
+	FormatContactKv(&kvMaps, title, nil, contactFormat, isSite, codeSite)
+	kvTags := GetKvTags(kvMaps, title, nil, isSite, codeSite)
 	return &util.JobKv{
 		Kvs:    kvMaps,
 		KvTags: kvTags,
@@ -35,7 +35,7 @@ func (se *SpacekvEntity) Entrance(text, title string, contactFormat *util.Contac
 }
 
 //空格分kv
-func (se *SpacekvEntity) divideKV(line string,isSite bool,codeSite string) []*util.Kv {
+func (se *SpacekvEntity) divideKV(line string, isSite bool, codeSite string) []*util.Kv {
 	line = strings.TrimSpace(line)
 	line = regReplAllSpace.ReplaceAllString(line, " ")
 	line = TimeHM.ReplaceAllString(line, "D$1H$2M")
@@ -55,8 +55,16 @@ func (se *SpacekvEntity) divideKV(line string,isSite bool,codeSite string) []*ut
 		if excludeSpaceKey.MatchString(k) {
 			continue
 		}
+		ktags := util.GetTags(k, isSite, codeSite)
 		//value为key值跳过
-		if util.GetTags(v,isSite,codeSite).Len() > 0 && util.GetTags(k,isSite,codeSite).Len() > 0{
+		if util.GetTags(v, isSite, codeSite).Len() > 0 && ktags.Len() > 0 {
+			continue
+		}
+		if ktags.Len() > 0 && (ktags[0].Value == "中标金额" || ktags[0].Value == "预算") && strings.Contains(kv[i], "万") {
+			kvs = append(kvs, &util.Kv{Key: k, Value: v + "万"})
+			continue
+		} else if ktags.Len() > 0 && (ktags[0].Value == "中标金额" || ktags[0].Value == "预算") && strings.Contains(kv[i], "亿") {
+			kvs = append(kvs, &util.Kv{Key: k, Value: v + "亿"})
 			continue
 		}
 		kvs = append(kvs, &util.Kv{Key: k, Value: v})