限制一下查询范围

models/english_report.go

@@ -90,10 +90,10 @@ type ElasticEnglishReportDetail struct {
 }
 
 // GetPrePublishedEnglishReports 获取定时发布时间为当前时间的未发布的英文报告列表
-func GetPrePublishedEnglishReports(startTime, endTime string) (list []*EnglishReport, err error) {
+func GetPrePublishedEnglishReports(startTime, endTime, afterDate string) (list []*EnglishReport, err error) {
 	o := orm.NewOrmUsingDB("rddp")
-	sql := `SELECT * FROM english_report WHERE state = 1 and pre_publish_time >= ? and pre_publish_time <= ?`
-	_, err = o.Raw(sql, startTime, endTime).QueryRows(&list)
+	sql := `SELECT * FROM english_report WHERE state = 1 and pre_publish_time >= ? and pre_publish_time <= ? and create_time >= ?`
+	_, err = o.Raw(sql, startTime, endTime, afterDate).QueryRows(&list)
 	return
 }
 

models/report.go

@@ -84,10 +84,10 @@ func EditReportContentHtml(reportId int, content string) (err error) {
 }
 
 // GetPrePublishedReports 获取定时发布时间为当前时间的未发布的报告列表
-func GetPrePublishedReports(startTime, endTime string) (list []*Report, err error) {
+func GetPrePublishedReports(startTime, endTime, afterDate string) (list []*Report, err error) {
 	o := orm.NewOrmUsingDB("rddp")
-	sql := `SELECT * FROM report WHERE state = 1 and pre_publish_time >= ? and pre_publish_time <=?`
-	_, err = o.Raw(sql, startTime, endTime).QueryRows(&list)
+	sql := `SELECT * FROM report WHERE state = 1 and pre_publish_time >= ? and pre_publish_time <=? and create_time >= ?`
+	_, err = o.Raw(sql, startTime, endTime, afterDate).QueryRows(&list)
 	return
 }
 

services/english_report.go

@@ -22,7 +22,8 @@ func PublishEnglishReport(cont context.Context) (err error) {
 	now := time.Now().Format(utils.FormatDateTimeMinute)
 	startTime := now + ":00"
 	endTime := now + ":59"
-	list, e := models.GetPrePublishedEnglishReports(startTime, endTime)
+	afterDate := time.Now().AddDate(0, -1, 0).Format(utils.FormatDate) //限制一下，只查询最近一个月的
+	list, e := models.GetPrePublishedEnglishReports(startTime, endTime, afterDate)
 	if e != nil {
 		return
 	}

services/report.go

@@ -254,7 +254,8 @@ func PublishReport(cont context.Context) (err error) {
 	now := time.Now().Format(utils.FormatDateTimeMinute)
 	startTime := now + ":00"
 	endTime := now + ":59"
-	list, e := models.GetPrePublishedReports(startTime, endTime)
+	afterDate := time.Now().AddDate(0, -1, 0).Format(utils.FormatDate) //限制一下，只查询最近一个月的
+	list, e := models.GetPrePublishedReports(startTime, endTime, afterDate)
 	if e != nil {
 		return
 	}