Roc 2 年之前
父節點
當前提交
fcb7ccd077
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      services/chart/chart_info.go

+ 2 - 2
services/chart/chart_info.go

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