|
@@ -469,7 +469,7 @@ func ProfitChartChartData(baseDataList []*models.EdbDataList, futureGoodEdbInfoM
|
|
|
tmpRealDateTime := findDateTime
|
|
|
tmpFindDataValue, tmpIsFind := edbDataMap[childFutureGoodEdbInfoId][findDateTime.Format(utils.FormatDate)]
|
|
|
|
|
|
- if tmpIsFind {
|
|
|
+ if tmpIsFind && tmpFindDataValue > 0 {
|
|
|
calculateMap[childFutureGoodEdbInfoId] = tmpFindDataValue
|
|
|
if maxDate.IsZero() || maxDate.Before(tmpRealDateTime) {
|
|
|
maxDate = tmpRealDateTime
|
|
@@ -518,7 +518,7 @@ func ProfitChartChartData(baseDataList []*models.EdbDataList, futureGoodEdbInfoM
|
|
|
}
|
|
|
//yDataMap[n] = calVal
|
|
|
//xEdbInfoIdList = append(xEdbInfoIdList, n)
|
|
|
- yDataMap[tmpN] = calVal
|
|
|
+ yDataMap[tmpN], _ = decimal.NewFromFloat(calVal).Round(4).Float64()
|
|
|
xEdbInfoIdList = append(xEdbInfoIdList, tmpN)
|
|
|
findDataList = append(findDataList, calVal)
|
|
|
}
|