wangshan 3 лет назад
Родитель
Сommit
51c45938a7
1 измененных файлов с 18 добавлено и 10 удалено
  1. 18 10
      jyBXBase/rpc/model/newestBidding.go

+ 18 - 10
jyBXBase/rpc/model/newestBidding.go

@@ -10,6 +10,7 @@ import (
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"jyBXBase/rpc/bxbase"
 	IC "jyBXBase/rpc/init"
+	"log"
 	"strings"
 	"time"
 )
@@ -54,8 +55,10 @@ func GetPushHistory(userId string) (res []*bxbase.NewestList) {
 			if list != nil {
 				for _, v := range *list {
 					_id := MC.ObjToString(v["_id"])
+					log.Println(_id, "--1---:", v["publishtime"])
 					bn := infos[_id]
 					bn.Title = MC.ObjToString(v["title"])
+					bn.PublishTime = MC.Int64All(v["publishtime"])
 					bn.Subtype = MC.If(v["subtype"] != nil, MC.ObjToString(v["subtype"]), MC.ObjToString(v["toptype"])).(string)
 					bn.Area = MC.If(MC.ObjToString(v["area"]) == "A", "全国", MC.ObjToString(v["area"])).(string)
 					bn.Buyerclass = MC.ObjToString(v["buyerclass"])
@@ -77,8 +80,10 @@ func GetPushHistory(userId string) (res []*bxbase.NewestList) {
 			if ok && *list != nil {
 				for _, v := range *list {
 					_id := mongodb.BsonIdToSId(v["_id"])
+					log.Println(_id, "---2--:", v["publishtime"])
 					bn := infos[_id]
 					bn.Title = MC.ObjToString(v["title"])
+					bn.PublishTime = MC.Int64All(v["publishtime"])
 					bn.Subtype = MC.If(v["subtype"] != nil, MC.ObjToString(v["subtype"]), MC.ObjToString(v["toptype"])).(string)
 					bn.Area = MC.If(MC.ObjToString(v["area"]) == "A", "全国", MC.ObjToString(v["area"])).(string)
 					bn.Buyerclass = MC.ObjToString(v["buyerclass"])
@@ -99,8 +104,10 @@ func GetPushHistory(userId string) (res []*bxbase.NewestList) {
 			if ok && *list != nil {
 				for _, v := range *list {
 					_id := mongodb.BsonIdToSId(v["_id"])
+					log.Println(_id, "---3--:", v["publishtime"])
 					bn := infos[_id]
 					bn.Title = MC.ObjToString(v["title"])
+					bn.PublishTime = MC.Int64All(v["publishtime"])
 					bn.Subtype = MC.If(v["subtype"] != nil, MC.ObjToString(v["subtype"]), MC.ObjToString(v["toptype"])).(string)
 					bn.Area = MC.If(MC.ObjToString(v["area"]) == "A", "全国", MC.ObjToString(v["area"])).(string)
 					bn.Buyerclass = MC.ObjToString(v["buyerclass"])
@@ -146,16 +153,17 @@ func NewestES(doSearchStr string) (res []*bxbase.NewestList) {
 		for _, v := range *list {
 			_id := mongodb.BsonIdToSId(v["_id"])
 			res = append(res, &bxbase.NewestList{
-				Id:         ME.EncodeArticleId2ByCheck(_id),
-				Title:      MC.ObjToString(v["title"]),
-				Subtype:    MC.If(v["subtype"] != nil, MC.ObjToString(v["subtype"]), MC.ObjToString(v["toptype"])).(string),
-				Area:       MC.If(MC.ObjToString(v["area"]) == "A", "全国", MC.ObjToString(v["area"])).(string),
-				Buyerclass: MC.ObjToString(v["buyerclass"]),
-				City:       MC.ObjToString(v["city"]),
-				Industry:   MC.If(MC.ObjToString(v["s_subscopeclass"]) != "", strings.Split(strings.Split(MC.ObjToString(v["s_subscopeclass"]), ",")[0], "_")[0], "").(string),
-				Budget:     MC.Int64All(v["budget"]),
-				Bidamount:  MC.Int64All(v["bidamount"]),
-				FileExists: v["filetext"] != nil,
+				Id:          ME.EncodeArticleId2ByCheck(_id),
+				Title:       MC.ObjToString(v["title"]),
+				Subtype:     MC.If(v["subtype"] != nil, MC.ObjToString(v["subtype"]), MC.ObjToString(v["toptype"])).(string),
+				Area:        MC.If(MC.ObjToString(v["area"]) == "A", "全国", MC.ObjToString(v["area"])).(string),
+				Buyerclass:  MC.ObjToString(v["buyerclass"]),
+				City:        MC.ObjToString(v["city"]),
+				Industry:    MC.If(MC.ObjToString(v["s_subscopeclass"]) != "", strings.Split(strings.Split(MC.ObjToString(v["s_subscopeclass"]), ",")[0], "_")[0], "").(string),
+				Budget:      MC.Int64All(v["budget"]),
+				Bidamount:   MC.Int64All(v["bidamount"]),
+				FileExists:  v["filetext"] != nil,
+				PublishTime: MC.Int64All(v["publishtime"]),
 			})
 		}
 	}