|
@@ -70,7 +70,7 @@ var (
|
|
|
//简单判断金额
|
|
|
filter_zbje_jd = regexp.MustCompile("^[^售]{0,4}(价|额).{0,4}$")
|
|
|
//且排队以下字眼的key
|
|
|
- filter_zbje_kn = regexp.MustCompile("得分|打分|时间|业绩|须知|分$")
|
|
|
+ filter_zbje_kn = regexp.MustCompile("得分|打分|时间|业绩|须知|分|要求$")
|
|
|
//且值包含以下字眼
|
|
|
filter_zbje_v = regexp.MustCompile("[¥$$0-9一二三四五六七八九十,,〇零点..壹贰叁肆伍陆柒捌玖拾百佰千仟万亿億元圆角分整正()::大小写]{2,16}")
|
|
|
|
|
@@ -170,10 +170,10 @@ func CommonDataAnaly(k, tabletag, tabledesc string, v interface{}) (kvTags map[s
|
|
|
if tabletag == "" {
|
|
|
returntag = "中标情况"
|
|
|
}
|
|
|
- kvTags["中标金额"] = append(kvTags["中标金额"], &u.Tag{Key: "中标金额", Value: v1, Weight: -100})
|
|
|
+ kvTags["中标金额"] = append(kvTags["中标金额"], &u.Tag{Key: k, Value: v1, Weight: -100})
|
|
|
} else if filter_zbdw_ky.MatchString(k) && !filter_zbdw_kn.MatchString(k) &&
|
|
|
filter_zbdw_v.MatchString(v1) {
|
|
|
- kvTags["中标单位"] = append(kvTags["中标单位"], &u.Tag{Key: "中标单位", Value: v1, Weight: -100})
|
|
|
+ kvTags["中标单位"] = append(kvTags["中标单位"], &u.Tag{Key: k, Value: v1, Weight: -100})
|
|
|
if tabletag == "" {
|
|
|
returntag = "中标情况"
|
|
|
}
|
|
@@ -185,7 +185,7 @@ func CommonDataAnaly(k, tabletag, tabledesc string, v interface{}) (kvTags map[s
|
|
|
if filter_tag_zb.MatchString(tabletag) || filter_tag_zb.MatchString(tabledesc) {
|
|
|
//u.Debug(v1, k, "-----", filter_zbdw_jd.MatchString(k), filter_zbdw_v.MatchString(v1))
|
|
|
if filter_zbje_jd.MatchString(k) && !filter_zbje_kn.MatchString(k) && filter_zbje_v.MatchString(v1) {
|
|
|
- kvTags["中标金额"] = append(kvTags["中标金额"], &u.Tag{Key: "中标金额", Value: v1, Weight: -100})
|
|
|
+ kvTags["中标金额"] = append(kvTags["中标金额"], &u.Tag{Key: k, Value: v1, Weight: -100})
|
|
|
|
|
|
} /*else if filter_zbdw_jd.MatchString(k) && filter_zbdw_v.MatchString(v1) {
|
|
|
k1 = append(k1, "中标单位")
|