|
|
@@ -109,7 +109,7 @@ func (e *entnichePush) getDatasFromMysql(MQFW mg.MongodbSim, PushMysql *mysql.My
|
|
|
findStr += " and date < " + fmt.Sprint(et.Unix()) + " and date >= " + fmt.Sprint(st.Unix())
|
|
|
}
|
|
|
if area != "" {
|
|
|
- findStr += " and city in ("
|
|
|
+ findStr += " and area in ("
|
|
|
var _area = ""
|
|
|
for _, v := range strings.Split(area, ",") {
|
|
|
if v == "全部" {
|
|
|
@@ -118,7 +118,7 @@ func (e *entnichePush) getDatasFromMysql(MQFW mg.MongodbSim, PushMysql *mysql.My
|
|
|
if _area != "" {
|
|
|
_area += ","
|
|
|
}
|
|
|
- _area += fmt.Sprint(PushMapping.City[v])
|
|
|
+ _area += fmt.Sprint(PushMapping.Area[v])
|
|
|
}
|
|
|
findStr += _area + ")"
|
|
|
}
|
|
|
@@ -128,7 +128,7 @@ func (e *entnichePush) getDatasFromMysql(MQFW mg.MongodbSim, PushMysql *mysql.My
|
|
|
findStr += " limit " + fmt.Sprint(start) + "," + fmt.Sprint(myPageSize)
|
|
|
}
|
|
|
findSQL = findSQL + findStr
|
|
|
- // log.Println("findsql:", findSQL)
|
|
|
+ //log.Println("findsql:", findSQL)
|
|
|
list := PushMysql.SelectBySql(findSQL)
|
|
|
if len(*list) > 0 {
|
|
|
pushCas := e.GetJyPushs(*list)
|
