Merge branch 'dev3.2' of http://192.168.3.207:10080/qmx/jy-data-extract into dev3.2

src/jy/pretreated/analystep.go

@@ -6,8 +6,7 @@ package pretreated
 import (
 	"encoding/json"
 	"jy/util"
-
-	//"log"
+	"log"
 	"strings"
 
 	"github.com/PuerkitoBio/goquery"
@@ -89,7 +88,7 @@ func processTableInBlock(bl *util.Block, job *util.Job) {
 		job.HasTable = 1
 		//添加标识:文本中有table
 		tabres := AnalyTableV2(tab, job.Category, bl.Title, tab.Text(), 2, job.SourceMid, job.RuleBlock) //解析表格入口 返回：汇总表格对象
-		processTableResult(tabres, bl, job)                                                                 //分析table解析结果
+		processTableResult(tabres, bl, job)                                                              //分析table解析结果
 		if bl.Title == "" && tabres.BlockTag != "" {
 			bl.Title = tabres.BlockTag
 		}
@@ -179,6 +178,7 @@ func processTableResult(tabres *TableResult, block *util.Block, job *util.Job) {
 	}
 	//处理中标人排序
 	wror := []map[string]interface{}{}
+	log.Println(tabres.WinnerOrder)
 	for _, v := range tabres.WinnerOrder {
 		entName, _ := v["entname"].(string)
 		v["entname"] = winnerOrderEntity.clear("中标单位", entName)

src/jy/pretreated/analytable.go

@@ -236,7 +236,6 @@ func (table *Table) KVFilter() {
 			as.AddKey(k, v)
 		}
 	}
-
 	//处理值是数组的kv放入标准化kv中//处理table.SortKV.value为数组的情况
 	table.sortKVArr(as, winnertag)
 	//
@@ -314,9 +313,6 @@ func (table *Table) KVFilter() {
 func (table *Table) sortKVArr(as *SortMap, winnertag bool) {
 	checkKey := map[int]bool{}
 	for kn, k := range as.Keys { //遍历table.SortKV.value为数组的key
-		if len(table.StandKV[k]) == 0 || strings.TrimSpace(table.StandKV[k][0].Value) != "" {
-			continue
-		}
 		v := as.Map[k]
 		if vm, ok := v.([]map[string]interface{}); ok && k == NullTxtBid {
 			if table.WinnerOrder == nil {