xg

bidding_data/config.json

@@ -2,7 +2,7 @@
   "mgodb": "192.168.3.207:27092",
   "dbsize": 12,
   "dbname": "wjh",
-  "dbcoll": "oprd_bidding",
+  "dbcoll": "f_sourceinfo_20220415_1",
   "qyxyColl": "oprd_qyxy",
   "uname": "SJZY_RWMIX_Other",
   "upwd": "SJZY@M34I6x7D9ata",
@@ -12,6 +12,6 @@
     "addr": "192.168.3.207:27092",
     "dbname": "wjh",
     "dbsize": 5,
-    "dbcoll": "oprd_bidding"
+    "dbcoll": "f_sourceinfo_20220415_1"
   }
 }

bidding_data/pareExcel.go

@@ -28,6 +28,7 @@ var MatchWayMap = map[string]string{
 	"全文匹配":   "detail",
 	"附件匹配":   "filetext",
 	"项目名称匹配": "projectname",
+	"采购单位行业": "buyerclass",
 }
 
 func initExcel(path string) {

bidding_data/task.go

@@ -12,6 +12,15 @@ import (
 
 var numReg = regexp.MustCompile("[0-9]+")
 
+func taskinfo1(tmp map[string]interface{}) {
+	info := tmp["v_baseinfo"].(map[string]interface{})
+	delete(info, "field_source")
+	delete(info, "v_fieldscore")
+	id := util.ObjToString(tmp["id"])
+	info["_id"] = mongodb.StringTOBsonId(id)
+	Mgo.SaveByOriID(collSave, info)
+}
+
 func taskinfo(info map[string]interface{}) {
 	id := mongodb.BsonIdToSId(info["_id"])
 	//info, ok := tmp["v_baseinfo"].(map[string]interface{})

project_data/config.json

@@ -6,8 +6,8 @@
   "mongodbPoolSize": 10,
   "mongodbName": "wjh",
   "hints":"publishtime_1",
-  "extractColl": "oprd_bidding",
-  "projectColl": "oprd_projectset",
+  "extractColl": "extract",
+  "projectColl": "projectset-test",
   "backupFlag": true,
   "siteColl": "site",
   "thread": 1,

project_data/merge_select.go

@@ -335,7 +335,6 @@ func Select(compareStr string, info *Info, compareInfo *ProjectInfo) (res, pj in
 			//项目编号不一致
 			if info.LenPC != len([]rune(compareInfo.ProjectCode)) {
 				if info.LenPN > 16 {
-
 					res = 2
 				} else {
 					res = 1

project_data/project.go

@@ -124,21 +124,23 @@ func (p *ProjectTask) startProjectMerge(info *Info, tmp map[string]interface{})
 		compareProject.score = 0
 		//问题出地LastTime!!!!!
 		diffTime := int64(math.Abs(float64(info.Publishtime - compareProject.LastTime)))
+		qu.Debug(diffTime, p.validTime)
 		if diffTime <= p.validTime {
 			//代理机构完全不相同，直接新建项目
 			if CheckContain(compareProject.Agency, info.Agency) == 3 {
 				continue
 			}
+			qu.Debug(diffTime)
 			//地区(省、市、区)不同，直接新建项目
 			if ComparePlace(compareProject, info) {
 				continue
 			}
-
+			qu.Debug(1)
 			info.PNBH = 0
 			info.PCBH = 0
 			info.PTCBH = 0
 			compareStr, score := comparePNC(info, compareProject)
-
+			qu.Debug(compareStr, score)
 			resVal, pjVal := Select(compareStr, info, compareProject)
 			//---------------------------------------
 			//log.Println(resVal, pjVal, compareProject)

project_data/task.go

@@ -264,6 +264,25 @@ func ParseInfo(tmp map[string]interface{}) (info *Info) {
 	thisinfo.LenPTC = len([]rune(thisinfo.PTC))
 	thisinfo.LenPN = len([]rune(thisinfo.ProjectName))
 
+	winner := util.ObjToString(tmp["winner"])
+	winners := []string{}
+	m1 := map[string]bool{}
+	if winner != "" {
+		m1[winner] = true
+		winners = append(winners, winner)
+	}
+	packageM, _ := tmp["package"].(map[string]interface{})
+	if packageM != nil {
+		thisinfo.HasPackage = true
+		for _, p := range packageM {
+			pm, _ := p.(map[string]interface{})
+			if pw := util.ObjToString(pm["winner"]); pw != "" && !m1[pw] {
+				m1[pw] = true
+				winners = append(winners, pw)
+			}
+		}
+	}
+	thisinfo.Winners = winners
 	//处理分包中数据异常问题
 	for k, tmp := range thisinfo.Package {
 		if ps, ok := tmp.([]map[string]interface{}); ok {