|
@@ -168,14 +168,6 @@ func (s *subscribePush) InfoFormat(p *PushCa, info *map[string]interface{}) *bxs
|
|
if infotype == "" {
|
|
if infotype == "" {
|
|
infotype = common.ObjToString((*info)["toptype"])
|
|
infotype = common.ObjToString((*info)["toptype"])
|
|
}
|
|
}
|
|
- if infotype == "" {
|
|
|
|
- infotype = common.ObjToString((*info)["type"])
|
|
|
|
- if infotype == "tender" {
|
|
|
|
- infotype = "招标"
|
|
|
|
- } else if infotype == "bid" {
|
|
|
|
- infotype = "中标"
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
_id := p.InfoId
|
|
_id := p.InfoId
|
|
if _id == "" {
|
|
if _id == "" {
|
|
_id = common.ObjToString((*info)["_id"])
|
|
_id = common.ObjToString((*info)["_id"])
|
|
@@ -327,7 +319,7 @@ func (s *subscribePush) getDatasFromMysql(spqp *SubPushQueryParam, starttime, en
|
|
}
|
|
}
|
|
//时间
|
|
//时间
|
|
if starttime > 0 && endtime > 0 {
|
|
if starttime > 0 && endtime > 0 {
|
|
- querys = append(querys, fmt.Sprintf("a.date>=%d and date<=%d", starttime, endtime))
|
|
|
|
|
|
+ querys = append(querys, fmt.Sprintf("a.date>=%d and a.date<=%d", starttime, endtime))
|
|
} else if starttime > 0 && endtime == 0 {
|
|
} else if starttime > 0 && endtime == 0 {
|
|
querys = append(querys, fmt.Sprintf("a.date>=%d", starttime))
|
|
querys = append(querys, fmt.Sprintf("a.date>=%d", starttime))
|
|
} else if starttime == 0 && endtime > 0 {
|
|
} else if starttime == 0 && endtime > 0 {
|
|
@@ -489,6 +481,7 @@ func (s *subscribePush) GetInfoByIds(Mgo_bidding mongodb.MongodbSim, bidding, bi
|
|
}
|
|
}
|
|
m := map[string]bool{}
|
|
m := map[string]bool{}
|
|
ids := []string{}
|
|
ids := []string{}
|
|
|
|
+ //ids = append(ids, "62e22992fe343325df46a5eb")
|
|
for _, v := range pushCas {
|
|
for _, v := range pushCas {
|
|
if m[v.InfoId] {
|
|
if m[v.InfoId] {
|
|
continue
|
|
continue
|