|
|
@@ -15,6 +15,7 @@ import (
|
|
|
"hongze/hongze_yb/utils"
|
|
|
"sort"
|
|
|
"strconv"
|
|
|
+ "strings"
|
|
|
"time"
|
|
|
)
|
|
|
|
|
|
@@ -307,7 +308,12 @@ func GetChartEdbData(chartInfoId int, startDate, endDate string, baseEdbInfoMapp
|
|
|
v.DataList = dataList
|
|
|
}
|
|
|
|
|
|
- xEdbIdValue, yDataList, err = BarChartData(baseEdbInfoMapping, edbInfoMappingList, futureGoodEdbInfoList, edbDataListMap, barChartInfoDateList, regionType, baseEdbInfoMapping.EndDate)
|
|
|
+ // 特殊处理日期
|
|
|
+ // 因为时间格式是：2023-07-19T00:00:00+08:00；所以需要分开
|
|
|
+ baseEndDateTime := strings.Split(baseEdbInfoMapping.EndDate, "T")
|
|
|
+ baseEndDate := baseEndDateTime[0]
|
|
|
+
|
|
|
+ xEdbIdValue, yDataList, err = BarChartData(baseEdbInfoMapping, edbInfoMappingList, futureGoodEdbInfoList, edbDataListMap, barChartInfoDateList, regionType, baseEndDate)
|
|
|
|
|
|
if len(barChartInfoConf.XDataList) > 0 {
|
|
|
xDataList = barChartInfoConf.XDataList
|
