中标候选人

src/jy/extract/extract.go

@@ -584,11 +584,11 @@ func (e *ExtractTask) ExtractDetail(j *ju.Job, isSite bool, codeSite string) {
 				}
 				data := clear.DoClearFn(cfn, []interface{}{v.Value, j.Content})
 				if key == "budget" || key == "bidamount" {
-						if istrue, ok := data[len(data)-1].(bool); istrue && ok {
-							j.Result[key][i].IsTrue = true
-						} else {
-							continue
-						}
+					if istrue, ok := data[len(data)-1].(bool); istrue && ok {
+						j.Result[key][i].IsTrue = true
+					} else {
+						continue
+					}
 				}
 				before, _ := v.Value.(string)
 				v.Value = data[0]
@@ -1582,9 +1582,9 @@ func AnalysisSaveResult(j, jf *ju.Job, e *ExtractTask) {
 				} else if v.Field == "projectname" {
 					tmp[v.Field] = v.Value
 					break
-				} else if v.Field == "bidamount"||v.Field =="budget"{
-					if v.IsTrue{
-						tmp[v.Field] =v.Value
+				} else if v.Field == "bidamount" || v.Field == "budget" {
+					if v.IsTrue {
+						tmp[v.Field] = v.Value
 						break
 					}
 				}
@@ -1888,8 +1888,8 @@ func auxInfo(j *ju.Job) map[string][]map[string]interface{} {
 					standardized = true
 				}
 			}
-			if field == "budget"||field == "bidamount"{
-				if !v.IsTrue{
+			if field == "budget" || field == "bidamount" {
+				if !v.IsTrue {
 					continue
 				}
 			}
@@ -2020,34 +2020,49 @@ func resetWinnerorder(j *ju.Job) {
 	}
 	maxlen := len(j.Winnerorder) - 1
 	//中标单位
-	i := 0
+	//i := 0
 	winners := []*ju.ExtField{}
-	for _, v := range j.Result["winner"] {
-		if v.Code == "winnerorder" {
-			if maxlen < i {
-				continue
-			}
-			j.Winnerorder[i]["entname"] = v.Value
-			i++
-		} else {
-			winners = append(winners, v)
-		}
-	}
-	j.Result["winner"] = winners
-	//中标金额
-	i = 0
 	bidamounts := []*ju.ExtField{}
-	for _, v := range j.Result["bidamount"] {
-		if v.Code == "winnerorder" {
-			if maxlen < i {
-				continue
-			}
-			j.Winnerorder[i]["price"] = v.Value
-			i++
-		} else {
-			bidamounts = append(bidamounts, v)
-		}
+	//for _, v := range j.Result["winner"] {
+	//	if v.Code == "winnerorder" {
+	//		if maxlen < i {
+	//			continue
+	//		}
+	//		j.Winnerorder[i]["entname"] = v.Value
+	//		i++
+	//	} else {
+	//		winners = append(winners, v)
+	//	}
+	//}
+	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"]} )
 	}
-	j.Result["bidamount"] = bidamounts
+	if j.Result["winner"] == nil{
+		j.Result["winner"] = winners
+	}else {
+		j.Result["winner"] = append(j.Result["winner"],winners... )
+	}
+	if j.Result["bidamount"]==nil{
+		j.Result["bidamount"] = winners
+	}else {
+		j.Result["bidamount"] =  append(j.Result["bidamount"],bidamounts... )
+	}
+	//j.Result["winner"] = winners
+	//中标金额
+	//i = 0
+	//bidamounts := []*ju.ExtField{}
+	//for _, v := range j.Result["bidamount"] {
+	//	if v.Code == "winnerorder" {
+	//		if maxlen < i {
+	//			continue
+	//		}
+	//		j.Winnerorder[i]["price"] = v.Value
+	//		i++
+	//	} else {
+	//		bidamounts = append(bidamounts, v)
+	//	}
+	//}
+	//j.Result["bidamount"] = bidamounts
 
 }