Explorar o código

Merge branch 'chart/12.0' into debug

Roc %!s(int64=2) %!d(string=hai) anos
pai
achega
32cd55ada8
Modificáronse 1 ficheiros con 2 adicións e 2 borrados
  1. 2 2
      services/chart/chart_info.go

+ 2 - 2
services/chart/chart_info.go

@@ -744,7 +744,7 @@ func BarChartData(mappingList []*chartEdbMappingModel.ChartEdbInfoMapping, edbDa
 					err = tmpErr
 					err = tmpErr
 					return
 					return
 				}
 				}
-				for tmpDateTime := findDateTime; tmpDateTime.After(minDateTime) || tmpDateTime.Equal(minDateTime); tmpDateTime.AddDate(0, 0, -1) {
+				for tmpDateTime := findDateTime; tmpDateTime.After(minDateTime) || tmpDateTime.Equal(minDateTime); tmpDateTime = tmpDateTime.AddDate(0, 0, -1) {
 					tmpDate := tmpDateTime.Format(utils.FormatDate)
 					tmpDate := tmpDateTime.Format(utils.FormatDate)
 					if _, ok := edbDataMap[edbInfoId][tmpDate]; ok { //如果能找到数据,那么就返回
 					if _, ok := edbDataMap[edbInfoId][tmpDate]; ok { //如果能找到数据,那么就返回
 						findDate = tmpDate
 						findDate = tmpDate
@@ -832,7 +832,7 @@ func BarChartData(mappingList []*chartEdbMappingModel.ChartEdbInfoMapping, edbDa
 					err = tmpErr
 					err = tmpErr
 					return
 					return
 				}
 				}
-				for tmpDateTime := findDateTime; tmpDateTime.After(minDateTime) || tmpDateTime.Equal(minDateTime); tmpDateTime.AddDate(0, 0, -1) {
+				for tmpDateTime := findDateTime; tmpDateTime.After(minDateTime) || tmpDateTime.Equal(minDateTime); tmpDateTime = tmpDateTime.AddDate(0, 0, -1) {
 					tmpDate := tmpDateTime.Format(utils.FormatDate)
 					tmpDate := tmpDateTime.Format(utils.FormatDate)
 					if _, ok := edbDataMap[edbInfoId][tmpDate]; ok { //如果能找到数据,那么就返回
 					if _, ok := edbDataMap[edbInfoId][tmpDate]; ok { //如果能找到数据,那么就返回
 						findDate = tmpDate
 						findDate = tmpDate