Merge branch 'dev3.4' of http://39.105.157.10:10080/qmx/jy-data-extract into dev3.4

fullproject/src_v1/project.go

@@ -478,10 +478,10 @@ func (p *ProjectTask) NewProject(tmp map[string]interface{}, thisinfo *Info) (st
 	bt := qu.ObjToString(tmp["toptype"])
 	bs := qu.ObjToString(tmp["subtype"])
 	p.mapBidLock.Lock()
-	if thisinfo.Infoformat == 2 {
+	if thisinfo.Infoformat == 2 || thisinfo.SubType == "拟建" {
 		set["bidstatus"] = "拟建"
 		bt = "拟建"
-	}else {
+	} else {
 		set["bidtype"] = bidtype[bs]
 		if bt == "招标" {
 			set["projectscope"] = qu.ObjToString(tmp["projectscope"])
@@ -1036,7 +1036,6 @@ func PackageFormat(info *Info, project *ProjectInfo) map[string]interface{} {
 				}
 			}
 		}
-		p1 = packageCopy
 	} else {
 		for k, v := range info.Package {
 			v1, _ := v.(map[string]interface{})

udpcreateindex/src/projectindex.go

@@ -35,6 +35,33 @@ func projectTask(data []byte, mapInfo map[string]interface{}) {
 	var n int
 	i := 0
 	for tmp := make(map[string]interface{}); query.Next(tmp); i = i + 1 {
+		pp := map[string]map[string]interface{}{}
+		if packages, ok := tmp["package"].(map[string]interface{}); ok {
+			for _, pks := range packages {
+				if pk, ok := pks.([]interface{}); ok {
+					for _, v := range pk {
+						if p, ok := v.(map[string]interface{}); ok {
+							winner := util.ObjToString(p["winner"])
+							bidamount := util.Float64All((p["bidamount"]))
+							if len(winner) > 4 && bidamount > 0 {
+								p := map[string]interface{}{
+									"winner":    winner,
+									"bidamount": bidamount,
+								}
+								pp[winner] = p
+							}
+						}
+					}
+				}
+			}
+		}
+		pk1 := []map[string]interface{}{}
+		for _, v := range pp {
+			pk1 = append(pk1, v)
+		}
+		if len(pk1) > 0 {
+			tmp["package1"] = pk1
+		}
 		//不生索引字段
 		delete(tmp, "package")
 		delete(tmp, "winnerorder")