|
|
@@ -425,8 +425,9 @@ func BarChartData(edbInfoMapping *models.ChartEdbInfoMapping, futureGoodMappingL
|
|
|
// err = tmpErr
|
|
|
// return
|
|
|
//}
|
|
|
- tmpRealDateTime := findDateTime
|
|
|
- tmpFindDataValue, tmpIsFind := edbDataMap[futureGoodMapping.FutureGoodEdbInfoId][findDateTime.Format(utils.FormatDate)]
|
|
|
+ //tmpRealDateTime := findDateTime // 按照配置找到的日期
|
|
|
+ tmpRealDateTime := realDateTime // 实际现货的日期
|
|
|
+ tmpFindDataValue, tmpIsFind := edbDataMap[futureGoodMapping.FutureGoodEdbInfoId][tmpRealDateTime.Format(utils.FormatDate)]
|
|
|
yDataMap[futureGoodMapping.FutureGoodEdbInfoId] = tmpFindDataValue
|
|
|
|
|
|
findDataList = append(findDataList, tmpFindDataValue)
|
|
|
@@ -492,7 +493,7 @@ func BarChartData(edbInfoMapping *models.ChartEdbInfoMapping, futureGoodMappingL
|
|
|
|
|
|
yDataList = append(yDataList, models.YData{
|
|
|
Date: yDate,
|
|
|
- ConfigDate: findDateTime,
|
|
|
+ ConfigDate: realDateTime,
|
|
|
Value: findDataList,
|
|
|
NoDataEdbList: noDataIdList,
|
|
|
XEdbInfoIdList: xEdbInfoIdList,
|
