|
@@ -1590,6 +1590,7 @@ type FieldValue struct {
|
|
|
Value interface{}
|
|
|
Count int
|
|
|
}
|
|
|
+var clearWinnerReg =regexp.MustCompile("名称|施工|拟定供应商名称|:|:")
|
|
|
|
|
|
//分析抽取结果并保存
|
|
|
func AnalysisSaveResult(j, jf *ju.Job, e *ExtractTask) {
|
|
@@ -1629,7 +1630,7 @@ func AnalysisSaveResult(j, jf *ju.Job, e *ExtractTask) {
|
|
|
var tmpBidamount, tmpBudget float64
|
|
|
//s_winner逗号分隔拼接,分包中标人
|
|
|
var tmpstr,savewinner []string
|
|
|
-
|
|
|
+ //按包排序
|
|
|
for b, v := range j.PackageInfo {
|
|
|
if v["winner"]!= nil && v["winner"]!=""{
|
|
|
tmpstr = append(tmpstr,b)
|
|
@@ -1673,7 +1674,12 @@ func AnalysisSaveResult(j, jf *ju.Job, e *ExtractTask) {
|
|
|
//s_winner逗号分隔拼接,分包中标人
|
|
|
sort.Strings(tmpstr)
|
|
|
for _,v := range tmpstr{
|
|
|
- savewinner = append(savewinner,qu.ObjToString(j.PackageInfo[v]["winner"]))
|
|
|
+ svvvv := qu.ObjToString(j.PackageInfo[v]["winner"])
|
|
|
+ savevvv := clearWinnerReg.ReplaceAllString(svvvv, "")
|
|
|
+ if savevvv == ""{
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ savewinner = append(savewinner,savevvv)
|
|
|
}
|
|
|
if (savewinner == nil || len(savewinner)==0) && tmp["winner"]!=nil{
|
|
|
tmp["s_winner"] = tmp["winner"]
|