Эх сурвалжийг харах

更新项目分包 逻辑

wcc 1 жил өмнө
parent
commit
7a56fbdb3d

+ 6 - 0
website_columns/column_test.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"regexp"
 	"testing"
 )
 
@@ -22,5 +23,10 @@ func TestTagBidding(t *testing.T) {
 	reb := calculateFlag(rea, columns)
 	fmt.Println("reb", reb)
 	//1000 0100 0001
+	s := "测试数据k包"
+	// 定义正则表达式,匹配标段1到标段9,标段一到标段九,第一包到第九包,A包到D包,分包、包件号、发包、标包等关键词
+	pattern := `(标段[1-9一二三四五六七八九]|包[1-9一二三四五六七八九]|第[1-9一二三四五六七八九]包|[a-kA-K]包|分包|包件号|发包|标包|总承包)`
+	regex := regexp.MustCompile(pattern)
 
+	fmt.Println(regex.MatchString(s))
 }

+ 27 - 18
website_columns/utils.go

@@ -7,6 +7,7 @@ import (
 	"jygit.jydev.jianyu360.cn/data_processing/common_utils/log"
 	"jygit.jydev.jianyu360.cn/data_processing/common_utils/mongodb"
 	"net/http"
+	"regexp"
 	"sort"
 	"strconv"
 	"strings"
@@ -106,26 +107,34 @@ func TagBidding(tmp map[string]interface{}) (res map[string]interface{}) {
 		}
 	}
 
-	if packages, ok := tmp["package"]; ok {
-		packageMap, ok := packages.(map[string]interface{})
-		if ok {
-			if len(packageMap) >= 0 {
-				for _, pack := range packageMap {
-					pac, okk := pack.(map[string]interface{})
-					if okk {
-						_, okk1 := pac["winner"]
-						_, okk2 := pac["bidamount"]
-						_, okk3 := pac["budget"]
-						if okk1 || okk2 || okk3 {
-							res["项目分包"] = 1
-							break
-						}
-					}
-				}
-			}
-		}
+	//项目分包标签;总承包;1-9包;
+	// 定义正则表达式,匹配标段1到标段9,标段一到标段九,第一包到第九包,A包到D包,分包、包件号、发包、标包等关键词
+	pattern := `(标段[1-9一二三四五六七八九]|包段[1-9一二三四五六七八九]|第[1-9一二三四五六七八九]包|[a-kA-K]包|分包|包件号|发包|标包|总承包)`
+	regex := regexp.MustCompile(pattern)
+	if regex.MatchString(title) || regex.MatchString(util.ObjToString(tmp["projectname"])) {
+		res["项目分包"] = 1
 	}
 
+	//if packages, ok := tmp["package"]; ok {
+	//	packageMap, ok := packages.(map[string]interface{})
+	//	if ok {
+	//		if len(packageMap) >= 0 {
+	//			for _, pack := range packageMap {
+	//				pac, okk := pack.(map[string]interface{})
+	//				if okk {
+	//					_, okk1 := pac["winner"]
+	//					_, okk2 := pac["bidamount"]
+	//					_, okk3 := pac["budget"]
+	//					if okk1 || okk2 || okk3 {
+	//						res["项目分包"] = 1
+	//						break
+	//					}
+	//				}
+	//			}
+	//		}
+	//	}
+	//}
+
 	//
 	if buyerclass != "" {
 		buyers1 := []string{"采矿业", "电信行业", "金融业", "建筑业", "能源化工", "农林牧渔", "批发零售", "信息技术", "运输物流", "制造业", "住宿餐饮"}