|
|
@@ -6,7 +6,6 @@ package pretreated
|
|
|
import (
|
|
|
"encoding/json"
|
|
|
"jy/util"
|
|
|
- "log"
|
|
|
"strings"
|
|
|
|
|
|
"github.com/PuerkitoBio/goquery"
|
|
|
@@ -61,7 +60,7 @@ func AnalyStart(job *util.Job) {
|
|
|
processTableResult(tabres, bl, job)
|
|
|
}
|
|
|
// for k, v := range bl.TableKV.Kv {
|
|
|
- // log.Println("bl.TableKV.Kv", k, v)
|
|
|
+ // //log.Println("bl.TableKV.Kv", k, v)
|
|
|
// }
|
|
|
} else {
|
|
|
//从正文里面找分包
|
|
|
@@ -70,8 +69,8 @@ func AnalyStart(job *util.Job) {
|
|
|
FindProjectCode(newCon, job) //匹配项目编号
|
|
|
bl.Text = HtmlToText(con)
|
|
|
//调用kv解析
|
|
|
- bl.ColonKV = GetKVAll(newCon, "", nil, 1)
|
|
|
- bl.SpaceKV = SspacekvEntity.Entrance(newCon, "", nil)
|
|
|
+ bl.ColonKV = GetKVAll(bl.Text, "", nil, 1)
|
|
|
+ bl.SpaceKV = SspacekvEntity.Entrance(bl.Text, "", nil)
|
|
|
//新加 未分块table中未能解析到中标候选人，从正文中解析
|
|
|
if job.Winnerorder == nil || len(job.Winnerorder) == 0 {
|
|
|
bl.Winnerorder = winnerOrderEntity.Find(bl.Text, true, 1)
|
|
|
@@ -178,7 +177,7 @@ func processTableResult(tabres *TableResult, block *util.Block, job *util.Job) {
|
|
|
}
|
|
|
//处理中标人排序
|
|
|
wror := []map[string]interface{}{}
|
|
|
- log.Println(tabres.WinnerOrder)
|
|
|
+ //log.Println(tabres.WinnerOrder)
|
|
|
for _, v := range tabres.WinnerOrder {
|
|
|
entName, _ := v["entname"].(string)
|
|
|
v["entname"] = winnerOrderEntity.clear("中标单位", entName)
|
fengweiqiang