|
@@ -494,7 +494,7 @@ func BarChartData(mappingList []*models.ChartEdbInfoMapping, edbDataListMap map[
|
|
|
err = tmpErr
|
|
|
return
|
|
|
}
|
|
|
- if utils.GetTimeSubDay(currDateTime, findDateTime) >= 5 {
|
|
|
+ if currDateTime.Equal(findDateTime) || currDateTime.Before(findDateTime) {
|
|
|
findDate = dataList[i].DataTime
|
|
|
break
|
|
|
}
|
|
@@ -587,7 +587,7 @@ func BarChartData(mappingList []*models.ChartEdbInfoMapping, edbDataListMap map[
|
|
|
err = tmpErr
|
|
|
return
|
|
|
}
|
|
|
- if utils.GetTimeSubDay(currDateTime, findDateTime) >= 5 {
|
|
|
+ if currDateTime.Equal(findDateTime) || currDateTime.Before(findDateTime) {
|
|
|
findDate = dataList[i].DataTime
|
|
|
break
|
|
|
}
|