|
@@ -298,10 +298,10 @@ func GetProfitChartEdbData(baseEdbInfo *models.EdbInfo, edbInfoList []*models.Ed
|
|
|
|
|
|
specialFutureGoodEdbInfoMap := make(map[int]map[int]*future_good.FutureGoodEdbInfo, 0)
|
|
|
|
|
|
- hasChina := false
|
|
|
+ isAllChina := true
|
|
|
for _, v := range zlFutureGoodEdbInfoList {
|
|
|
- if v.RegionType == "国内" {
|
|
|
- hasChina = true
|
|
|
+ if v.RegionType != "国内" {
|
|
|
+ isAllChina = false
|
|
|
break
|
|
|
}
|
|
|
}
|
|
@@ -363,10 +363,6 @@ func GetProfitChartEdbData(baseEdbInfo *models.EdbInfo, edbInfoList []*models.Ed
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
- if hasChina {
|
|
|
- maxN = 12
|
|
|
- }
|
|
|
|
|
|
|
|
|
dateListMap := make(map[string][]string, 0)
|
|
@@ -684,7 +680,7 @@ func ProfitChartChartData(baseEdbInfo *models.EdbInfo, baseDataListMap map[int][
|
|
|
}
|
|
|
|
|
|
|
|
|
-func getProfitFutureGoodEdbInfoList(earliestDateTime time.Time, zlFutureGoodEdbInfo *future_good.FutureGoodEdbInfo, tmpFutureGoodEdbInfoList []*future_good.FutureGoodEdbInfo, monthNum int) (futureGoodEdbInfoDateMap map[string]*future_good.FutureGoodEdbInfo, newMaxN int, err error) {
|
|
|
+func getProfitFutureGoodEdbInfoList(earliestDateTime time.Time, zlFutureGoodEdbInfo *future_good.FutureGoodEdbInfo, tmpFutureGoodEdbInfoList []*future_good.FutureGoodEdbInfo, isAllChina bool, monthNum int) (futureGoodEdbInfoDateMap map[string]*future_good.FutureGoodEdbInfo, newMaxN int, err error) {
|
|
|
maxN := 36
|
|
|
futureGoodEdbInfoList := make([]*future_good.FutureGoodEdbInfo, 0)
|
|
|
futureGoodEdbInfoDateMap = make(map[string]*future_good.FutureGoodEdbInfo)
|