|
@@ -75,7 +75,7 @@ func TimedTaskDatamap(days int, lasttime int64, numIndex int) *datamap {
|
|
// log.Println("当前 n:", n, "数量:", continuSum, tmp["_id"], tmp["publishtime"])
|
|
// log.Println("当前 n:", n, "数量:", continuSum, tmp["_id"], tmp["publishtime"])
|
|
//}
|
|
//}
|
|
if qutil.IntAll(tmp["repeat"]) == 1 || qutil.IntAll(tmp["repeat"]) == -1 ||
|
|
if qutil.IntAll(tmp["repeat"]) == 1 || qutil.IntAll(tmp["repeat"]) == -1 ||
|
|
- qutil.IntAll(tmp["dataging"]) == 1 {
|
|
|
|
|
|
+ qutil.IntAll(tmp["dataging"]) == 1 || qutil.ObjToString(tmp["subtype"]) == "拟建" {
|
|
|
|
|
|
} else {
|
|
} else {
|
|
if fmt.Sprint(reflect.TypeOf(tmp["publishtime"])) == "string" {
|
|
if fmt.Sprint(reflect.TypeOf(tmp["publishtime"])) == "string" {
|
|
@@ -143,7 +143,7 @@ func NewDatamap(days int, lastid string) *datamap {
|
|
nowTime := time.Now().Unix() //当前时间的时间戳
|
|
nowTime := time.Now().Unix() //当前时间的时间戳
|
|
n, continuSum := 0, 0
|
|
n, continuSum := 0, 0
|
|
for tmp := make(map[string]interface{}); it.Next(&tmp); n++ {
|
|
for tmp := make(map[string]interface{}); it.Next(&tmp); n++ {
|
|
- if qutil.IntAll(tmp["repeat"]) == 1 || qutil.IntAll(tmp["repeat"]) == -1 {
|
|
|
|
|
|
+ if qutil.IntAll(tmp["repeat"]) == 1 || qutil.IntAll(tmp["repeat"]) == -1 || qutil.ObjToString(tmp["subtype"]) == "拟建" {
|
|
|
|
|
|
} else {
|
|
} else {
|
|
if fmt.Sprint(reflect.TypeOf(tmp["publishtime"])) == "string" {
|
|
if fmt.Sprint(reflect.TypeOf(tmp["publishtime"])) == "string" {
|