|
@@ -13,10 +13,13 @@ import (
|
|
|
|
|
|
"github.com/PuerkitoBio/goquery"
|
|
"github.com/PuerkitoBio/goquery"
|
|
)
|
|
)
|
|
-
|
|
|
|
-var yjReg *regexp.Regexp = regexp.MustCompile("(打分表|负责人|单位|个人|投标人|项目|企业)业绩|主要人员相关资料|投标文件格式|唱标记录|否决投标的?情况说明")
|
|
|
|
|
|
+//投标文件格式
|
|
|
|
+var yjReg *regexp.Regexp = regexp.MustCompile("(打分表|负责人|单位|个人|投标人|项目|企业)业绩|主要人员相关资料|唱标记录|否决投标的?情况说明")
|
|
var hisReg = regexp.MustCompile("(开标记录|类似业绩|历史业绩|填报项目业绩|[得评]+[审打]{0,2}分情况|无效标)[::\n]*.*?[\n]?(</td>)")
|
|
var hisReg = regexp.MustCompile("(开标记录|类似业绩|历史业绩|填报项目业绩|[得评]+[审打]{0,2}分情况|无效标)[::\n]*.*?[\n]?(</td>)")
|
|
-var hisReg2 = regexp.MustCompile("(开标记录|业绩|[得评]+[审打]{0,2}分情况|无效标)[::\n]*.*?[\n]?(</tr>|</table>|</td>)")
|
|
|
|
|
|
+var hisReg2 = regexp.MustCompile("(开标记录|业绩|[得评]+[审打]{0,2}分情况|无效标)[::\n]*.*?[\n]?(.*原因及其依据.*[::]?)?[\n]?.*?[\n]?(</tr>|</table>|</td>)")
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
var formattext = regexp.MustCompile("(投标总价)([0-9,.万元]*)")
|
|
var formattext = regexp.MustCompile("(投标总价)([0-9,.万元]*)")
|
|
var formattext2 = regexp.MustCompile("中标单价.*(中标总价.*)")
|
|
var formattext2 = regexp.MustCompile("中标单价.*(中标总价.*)")
|
|
var formattext3 = regexp.MustCompile("(同类项目业绩、|[1-9].[0-9]包段划分)")
|
|
var formattext3 = regexp.MustCompile("(同类项目业绩、|[1-9].[0-9]包段划分)")
|
|
@@ -28,7 +31,7 @@ func AnalyStart(job *util.Job, isSite bool, codeSite string) {
|
|
//格式化正文 -断点
|
|
//格式化正文 -断点
|
|
con = formattext3.ReplaceAllString(con,"")
|
|
con = formattext3.ReplaceAllString(con,"")
|
|
con = hisReg.ReplaceAllString(con, "${2}")
|
|
con = hisReg.ReplaceAllString(con, "${2}")
|
|
- con = hisReg2.ReplaceAllString(con, "${2}")
|
|
|
|
|
|
+ con = hisReg2.ReplaceAllString(con, "${3}")
|
|
con = formattext.ReplaceAllString(con, "${1}:${2}")
|
|
con = formattext.ReplaceAllString(con, "${1}:${2}")
|
|
con = formattext2.ReplaceAllString(con, "${1}")
|
|
con = formattext2.ReplaceAllString(con, "${1}")
|
|
|
|
|
|
@@ -63,9 +66,12 @@ func AnalyStart(job *util.Job, isSite bool, codeSite string) {
|
|
}
|
|
}
|
|
FindProjectCode(bl.Text, job) //匹配项目编号
|
|
FindProjectCode(bl.Text, job) //匹配项目编号
|
|
processTableInBlock(bl, job, isSite, codeSite) //处理表格
|
|
processTableInBlock(bl, job, isSite, codeSite) //处理表格
|
|
|
|
+
|
|
//新加 未分块table中未能解析到中标候选人,从正文中解析
|
|
//新加 未分块table中未能解析到中标候选人,从正文中解析
|
|
if job.Winnerorder == nil || len(job.Winnerorder) == 0 {
|
|
if job.Winnerorder == nil || len(job.Winnerorder) == 0 {
|
|
- bl.Winnerorder = winnerOrderEntity.Find(bl.Text, true, 1, isSite, codeSite)
|
|
|
|
|
|
+ //表格没有划分时候:-纯文本匹配
|
|
|
|
+ tmp_text := HtmlToText(bl.Text)
|
|
|
|
+ bl.Winnerorder = winnerOrderEntity.Find(tmp_text, true, 1, isSite, codeSite)
|
|
job.Winnerorder = bl.Winnerorder
|
|
job.Winnerorder = bl.Winnerorder
|
|
}
|
|
}
|
|
job.Block = append(job.Block, bl)
|
|
job.Block = append(job.Block, bl)
|