4

src/jy/pretreated/analykv.go

@@ -2,7 +2,8 @@ package pretreated
 
 import (
 	u "jy/util"
-	//qu "qfw/util"
+	"qfw/util"
+
 	"regexp"
 	"strings"
 )
@@ -431,7 +432,7 @@ func keydetail(k, v string, m *SortMap, tag string, pos int, strs [][]string, ma
 			if vvv, ok := m.Map[k].([]string); ok {
 				vals = append(vals, vvv...)
 			} else {
-				vals = append(vals, v)
+				vals = append(vals,  util.ObjToString(m.Map[k]))
 			}
 			vals = append(vals, v)
 			m.AddKey(k, vals)

src/jy/pretreated/analystep.go

@@ -14,18 +14,20 @@ import (
 	"github.com/PuerkitoBio/goquery"
 )
 
-var yjReg *regexp.Regexp = regexp.MustCompile("单位业绩|个人业绩|投标人业绩|主要人员相关资料|投标文件格式|唱标记录|项目业绩|否决投标的?情况说明")
-var hisReg = regexp.MustCompile("(<td>|<tr>|<table>).*(开标记录|业绩|[得评]+[审打]{0,2}分情况|无效标)[：:\n]*.*?[\n]?(</tr>|</table>|</td>)")
+var yjReg *regexp.Regexp = regexp.MustCompile("(打分表|负责人|单位|个人|投标人|项目|企业)业绩|主要人员相关资料|投标文件格式|唱标记录|否决投标的?情况说明")
+var hisReg = regexp.MustCompile("(开标记录|业绩|[得评]+[审打]{0,2}分情况|无效标)[：:\n]*.*?[\n]?(</td>)")
 var hisReg2 = regexp.MustCompile("(开标记录|业绩|[得评]+[审打]{0,2}分情况|无效标)[：:\n]*.*?[\n]?(</tr>|</table>|</td>)")
 var formattext = regexp.MustCompile("(投标总价)([0-9,.万元]*)")
 var formattext2 = regexp.MustCompile("中标单价.*(中标总价.*)")
+var formattext3 = regexp.MustCompile("(同类项目业绩、)")
 
 func AnalyStart(job *util.Job, isSite bool, codeSite string) {
 	con := job.Content
 	//全文的需要修复表格
 	con = RepairCon(con)
 	//格式化正文
-	con = hisReg.ReplaceAllString(con, "")
+	con = formattext3.ReplaceAllString(con,"")
+	con = hisReg.ReplaceAllString(con, "${2}")
 	con = hisReg2.ReplaceAllString(con, "${2}")
 	con = formattext.ReplaceAllString(con, "${1}:${2}")
 	con = formattext2.ReplaceAllString(con, "${1}")
@@ -118,10 +120,10 @@ func processTableInBlock(bl *util.Block, job *util.Job, isSite bool, codeSite st
 	//块中再查找表格(块,处理完把值赋到块)
 	bl.Text = formatText(bl.Text, "biangeng")
 	tabs, _ := ComputeConRatio(bl.Text, 2)
-	for _, tab := range tabs {
+	for i, tab := range tabs {
 		job.HasTable = 1
 		tmptag := ""
-		if bl.Title != "" && len(bl.Title) < 20 {
+		if i == 0 && bl.Title != "" && len(bl.Title) < 20 {
 			tmptag = bl.Title
 		} else if tab.Nodes[0] != nil && tab.Nodes[0].PrevSibling != nil {
 			tmptag = strings.TrimSpace(tab.Nodes[0].PrevSibling.Data)