|
@@ -331,7 +331,7 @@ func GetProfitChartEdbData(baseEdbInfo *models.EdbInfo, zlFutureGoodEdbInfoList
|
|
|
return dateList[i] < dateList[j]
|
|
|
})
|
|
|
|
|
|
- _, yDataList, err = ProfitChartChartData(baseDataList, futureGoodEdbInfoDateMap, futureGoodDataListMap, chartInfoDateList, latestDate, specialFutureGoodEdbInfoMap, formulaStr, tagEdbIdMap, dateList)
|
|
|
+ _, yDataList, err = ProfitChartChartData(baseDataList, futureGoodEdbInfoDateMap, futureGoodDataListMap, chartInfoDateList, latestDate, specialFutureGoodEdbInfoMap, formulaStr, tagEdbIdMap, dateList, maxN)
|
|
|
if err != nil {
|
|
|
return
|
|
|
}
|
|
@@ -353,7 +353,7 @@ func GetProfitChartEdbData(baseEdbInfo *models.EdbInfo, zlFutureGoodEdbInfoList
|
|
|
}
|
|
|
|
|
|
// ProfitChartChartData 获取数据
|
|
|
-func ProfitChartChartData(baseDataList []*models.EdbDataList, futureGoodEdbInfoMap map[int]map[string]*future_good.FutureGoodEdbInfo, futureGoodEdbDataListMap map[int][]*models.EdbDataList, chartInfoDateList []ChartInfoDateReq, latestDate string, specialFutureGoodEdbInfoMap map[int]map[int]*future_good.FutureGoodEdbInfo, formulaStr string, tagEdbIdMap map[string]int, dateList []string) (edbIdList []int, yDataList []YData, err error) {
|
|
|
+func ProfitChartChartData(baseDataList []*models.EdbDataList, futureGoodEdbInfoMap map[int]map[string]*future_good.FutureGoodEdbInfo, futureGoodEdbDataListMap map[int][]*models.EdbDataList, chartInfoDateList []ChartInfoDateReq, latestDate string, specialFutureGoodEdbInfoMap map[int]map[int]*future_good.FutureGoodEdbInfo, formulaStr string, tagEdbIdMap map[string]int, dateList []string, maxN int) (edbIdList []int, yDataList []YData, err error) {
|
|
|
// 指标数据数组(10086:{"2022-12-02":100.01,"2022-12-01":102.3})
|
|
|
//earliestDateTime time.Time
|
|
|
// ETA指标数据
|
|
@@ -436,11 +436,17 @@ func ProfitChartChartData(baseDataList []*models.EdbDataList, futureGoodEdbInfoM
|
|
|
//}
|
|
|
//findDateTime
|
|
|
|
|
|
+ // 获取当前日期相对开始日期的期数
|
|
|
tmpN := (currDate.Year()-findDateTime.Year())*12 + int(currDate.Month()-findDateTime.Month())
|
|
|
if tmpN <= 0 {
|
|
|
continue
|
|
|
}
|
|
|
|
|
|
+ // 如果期数大于最大期数,那么就退出当前匹配
|
|
|
+ if tmpN >= maxN {
|
|
|
+ break
|
|
|
+ }
|
|
|
+
|
|
|
zlAndChildEdbId := make(map[int]int)
|
|
|
childFutureGoodEdbInfoIdList := make([]int, 0)
|
|
|
for zlFutureGoodEdbInfoId, futureGoodEdbInfoList := range futureGoodEdbInfoMap {
|