xg

src/front/group.go

@@ -859,6 +859,7 @@ func (f *Front) GroupExportData() {
 			"v_baseinfo.publishtime":  1,
 			"v_baseinfo.href":         1,
 			"v_baseinfo.jybxhref":     1,
+			"v_baseinfo.multipackage": 1,
 			"v_baseinfo.budget":       1,
 			"v_baseinfo.toptype":      1,
 			"v_baseinfo.subtype":      1,
@@ -905,6 +906,7 @@ func (f *Front) GroupExportData() {
 					row.AddCell().SetValue(qu.FormatDateByInt64(&pb, qu.Date_Short_Layout))
 					row.AddCell().SetValue(qu.ObjToString(baseinfo["href"]))
 					row.AddCell().SetValue(qu.ObjToString(baseinfo["jybxhref"]))
+					row.AddCell().SetValue(qu.IntAll(baseinfo["multipackage"]))
 					row.AddCell().SetValue(qu.ObjToString(l["tagname"]))
 					row.AddCell().SetValue(qu.ObjToString(l["tagname2"]))
 					row.AddCell().SetValue(qu.ObjToString(baseinfo["is_effective"]))
@@ -927,6 +929,7 @@ func (f *Front) GroupExportData() {
 				row.AddCell().SetValue(qu.FormatDateByInt64(&pb, qu.Date_Short_Layout))
 				row.AddCell().SetValue(qu.ObjToString(baseinfo["href"]))
 				row.AddCell().SetValue(qu.ObjToString(baseinfo["jybxhref"]))
+				row.AddCell().SetValue(baseinfo["multipackage"])
 				row.AddCell().SetValue(qu.ObjToString(l["tagname"]))
 				row.AddCell().SetValue(qu.ObjToString(l["tagname2"]))
 				row.AddCell().SetValue(qu.ObjToString(baseinfo["is_effective"]))
@@ -961,6 +964,7 @@ var FieldsMap = map[string]string{
 	"中标人":     "s_winner",
 	"招标人":     "buyer",
 	"中标金额":    "bidamount",
+	"多包标识":    "multipackage",
 }
 
 func (f *Front) GroupImportData() {
@@ -978,7 +982,8 @@ func (f *Front) GroupImportData() {
 	cellFieldName := map[int]string{}
 	count := 0
 	lastid := ""
-	c1 := 0 // 多包第n条数据
+	c1 := 0                                  // 多包第n条数据
+	packageM := make(map[string]interface{}) // 记录多包信息，多行用到
 	for rn, row := range rows {
 		update := make(map[string]interface{})
 		del := make(map[string]interface{})
@@ -1024,23 +1029,21 @@ func (f *Front) GroupImportData() {
 						"v_baseinfo.bidamount": 1, "v_baseinfo.package": 1})
 					if len(*info) > 0 {
 						baseinfo := (*info)["v_baseinfo"].(map[string]interface{})
-						if baseinfo["package"] != nil {
-							packageM := baseinfo["package"].(map[string]interface{})
-							m := make(map[string]interface{})
-							if update["v_baseinfo.bidamount"] != nil {
-								m["bidamount"] = qu.Float64All(update["v_baseinfo.bidamount"])
-							}
-							if update["v_baseinfo.s_winner"] != nil {
-								m["s_winner"] = qu.ObjToString(update["v_baseinfo.s_winner"])
-							}
-							m["is_push"] = qu.IntAll(update["is_push"])
-							packageM[fmt.Sprint(c1)] = map[string]interface{}{"winner_all": append([]interface{}{}, m)}
-							update["v_baseinfo.package"] = packageM
+						m := make(map[string]interface{})
+						if update["v_baseinfo.bidamount"] != nil {
+							m["bidamount"] = qu.Float64All(update["v_baseinfo.bidamount"])
+						}
+						if update["v_baseinfo.s_winner"] != nil {
+							m["s_winner"] = qu.ObjToString(update["v_baseinfo.s_winner"])
 						}
-						if s := qu.ObjToString(baseinfo["tagname"]); s != "" {
+						m["is_push"] = qu.IntAll(update["is_push"])
+						//packageM[fmt.Sprint(c1)] = map[string]interface{}{"winner_all": append([]interface{}{}, m)}
+						packageM[fmt.Sprint(c1)] = m
+						update["v_baseinfo.package"] = packageM
+						if s := qu.ObjToString(baseinfo["tagname"]); s != "" && qu.ObjToString(update["v_baseinfo.tagname"]) != "" {
 							update["v_baseinfo.tagname"] = s + "," + qu.ObjToString(update["v_baseinfo.tagname"])
 						}
-						if s := qu.ObjToString(baseinfo["tagname2"]); s != "" {
+						if s := qu.ObjToString(baseinfo["tagname2"]); s != "" && qu.ObjToString(update["v_baseinfo.tagname2"]) != "" {
 							update["v_baseinfo.tagname2"] = s + "," + qu.ObjToString(update["v_baseinfo.tagname2"])
 						}
 						if s := qu.ObjToString(baseinfo["s_winner"]); s != "" {
@@ -1051,7 +1054,7 @@ func (f *Front) GroupImportData() {
 					}
 				} else {
 					c1 = 0
-					packageM := make(map[string]interface{})
+					packageM = make(map[string]interface{})
 					m := make(map[string]interface{})
 					if update["v_baseinfo.bidamount"] != nil {
 						m["bidamount"] = qu.Float64All(update["v_baseinfo.bidamount"])
@@ -1059,7 +1062,8 @@ func (f *Front) GroupImportData() {
 					if update["v_baseinfo.s_winner"] != nil {
 						m["s_winner"] = qu.ObjToString(update["v_baseinfo.s_winner"])
 					}
-					packageM[fmt.Sprint(c1)] = map[string]interface{}{"winner_all": append([]interface{}{}, m)}
+					//packageM[fmt.Sprint(c1)] = map[string]interface{}{"winner_all": append([]interface{}{}, m)}
+					packageM[fmt.Sprint(c1)] = m
 					update["v_baseinfo.package"] = packageM
 					c1++
 				}
@@ -1068,8 +1072,6 @@ func (f *Front) GroupImportData() {
 				c1 = 0
 			}
 			lastid = id
-			qu.Debug("id----", id)
-			qu.Debug("update----", update)
 			if len(del) > 0 {
 				util.Mgo.UpdateById(sourceinfo, id, bson.M{"$set": update, "$unset": del})
 			} else {

src/front/project.go

@@ -1152,9 +1152,9 @@ func GetDataById(idInfoArr []util.Data, importType, s_sourceinfo string, success
 			}
 			if bidData != nil && len(*bidData) > 0 { //bidding表数据存在
 				//2.查extract
-				extData, _ := util.MgoE.FindById(util.ExtColl1, id, map[string]interface{}{"attach_text": 0})
+				extData, _ := util.MgoE.FindById(util.ExtColl1, id, map[string]interface{}{"attach_text": 0, "field_source": 0, "regions_log": 0})
 				if extData == nil || len(*extData) == 0 {
-					extData, _ = util.MgoE.FindById(util.ExtColl2, id, map[string]interface{}{"attach_text": 0, "field_source": 0})
+					extData, _ = util.MgoE.FindById(util.ExtColl2, id, map[string]interface{}{"attach_text": 0, "field_source": 0, "regions_log": 0})
 				}
 				//抽取表字段合并到bidding
 				if extData != nil && len(*extData) > 0 {