|
|
@@ -336,7 +336,7 @@ func GetProfitChartEdbData(baseEdbInfo *models.EdbInfo, zlFutureGoodEdbInfoList
|
|
|
return dateList[i] < dateList[j]
|
|
|
})
|
|
|
|
|
|
- _, yDataList, err = ProfitChartChartData(baseDataList, futureGoodEdbInfoDateMap, futureGoodDataListMap, chartInfoDateList, latestDate, specialFutureGoodEdbInfoMap, formulaStr, tagEdbIdMap, dateList, maxN)
|
|
|
+ _, yDataList, err = ProfitChartChartData(baseDataList, futureGoodEdbInfoDateMap, futureGoodDataListMap, chartInfoDateList, baseEdbInfo.EndDate, specialFutureGoodEdbInfoMap, formulaStr, tagEdbIdMap, dateList, maxN)
|
|
|
if err != nil {
|
|
|
return
|
|
|
}
|
|
|
@@ -557,7 +557,7 @@ func ProfitChartChartData(baseDataList []*models.EdbDataList, futureGoodEdbInfoM
|
|
|
|
|
|
yDataList = append(yDataList, YData{
|
|
|
Date: yDate,
|
|
|
- ConfigDate: findDateTime,
|
|
|
+ ConfigDate: realDateTime,
|
|
|
Value: findDataList,
|
|
|
NoDataEdbList: noDataIdList,
|
|
|
XEdbInfoIdList: xEdbInfoIdList,
|
