|
|
@@ -309,14 +309,10 @@ func ProfitChartChartData(baseDataList []*data_manage.EdbDataList, futureGoodEdb
|
|
|
|
|
|
calculateMap := make(map[int]float64)
|
|
|
for _, childFutureGoodEdbInfoId := range childFutureGoodEdbInfoIdList {
|
|
|
- tmpRealDateTime := findDateTime
|
|
|
- tmpFindDataValue, tmpIsFind := edbDataMap[childFutureGoodEdbInfoId][findDateTime.Format(utils.FormatDate)]
|
|
|
+ tmpFindDataValue, tmpIsFind := edbDataMap[childFutureGoodEdbInfoId][realDateTime.Format(utils.FormatDate)]
|
|
|
|
|
|
if tmpIsFind && tmpFindDataValue != 0 {
|
|
|
calculateMap[childFutureGoodEdbInfoId] = tmpFindDataValue
|
|
|
- if maxDate.IsZero() || maxDate.Before(tmpRealDateTime) {
|
|
|
- maxDate = tmpRealDateTime
|
|
|
- }
|
|
|
}
|
|
|
}
|
|
|
// 合约的数据不全，不参与计算
|
