..

.gitignore

@@ -4,11 +4,12 @@
 /routers/.DS_Store
 /rdlucklog
 /conf/*.conf
-/binlog/*.log
+/binlog/*
 /*.pdf
 /eta_api.tar.gz
 /eta_api
 /static/searchKeywordCount.xlsx
+/static/images/*
 .DS_Store
 /doc/
 *.DS_Store

services/data/chart_info.go

@@ -857,7 +857,7 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
 			return
 		}
 
-		if lastDateT.Before(startT) || lastDateT.Before(endT) {
+		if lastDateT.Before(startT) {
 			//如果最新的日期在起始日之前，则跳出循环
 			break
 		}
@@ -876,6 +876,10 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
 			ShowName:  showName,
 		}
 		dataMap[name] = item
+		if lastDateT.Before(endT) {
+			//如果最新的日期在起始日之前，则跳出循环
+			break
+		}
 	}
 	for k, v := range dataMap {
 		if leftNameFlag {
@@ -1038,7 +1042,7 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
 			return
 		}
 
-		if lastDateT.Before(startT) || lastDateT.Before(endT) {
+		if lastDateT.Before(startT) {
 			//如果最新的日期在起始日之前，则跳出循环
 			break
 		}
@@ -1057,6 +1061,11 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
 			ShowName:  showName,
 		}
 		dataMap[showName] = item
+
+		if lastDateT.Before(endT) {
+			//如果最新的日期在起始日之前，则跳出循环
+			break
+		}
 	}
 	for k, v := range dataMap {
 		if leftNameFlag {