|
@@ -1100,10 +1100,12 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
|
|
|
|
|
|
|
|
//判断哪些点应该落在同一条时间线上
|
|
//判断哪些点应该落在同一条时间线上
|
|
|
maxY := lastDateT.Year()
|
|
maxY := lastDateT.Year()
|
|
|
|
|
+ changeFlag := false
|
|
|
if lastDateT.Month() >= 11 {
|
|
if lastDateT.Month() >= 11 {
|
|
|
maxY = maxY + 1
|
|
maxY = maxY + 1
|
|
|
}
|
|
}
|
|
|
if maxY < nowYear {
|
|
if maxY < nowYear {
|
|
|
|
|
+ changeFlag = true
|
|
|
maxY = nowYear
|
|
maxY = nowYear
|
|
|
}
|
|
}
|
|
|
endTmp := fmt.Sprintf("%d-%s", maxY, xEndDate)
|
|
endTmp := fmt.Sprintf("%d-%s", maxY, xEndDate)
|
|
@@ -1118,7 +1120,7 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
|
|
|
fmt.Println("横轴截取日" + startTmpT.Format(utils.FormatDate) + " " + endTmpT.Format(utils.FormatDate))
|
|
fmt.Println("横轴截取日" + startTmpT.Format(utils.FormatDate) + " " + endTmpT.Format(utils.FormatDate))
|
|
|
for name, dateItem := range dataMap {
|
|
for name, dateItem := range dataMap {
|
|
|
lv, ok1 := yearDataListMap[dateItem.EndDate.Year()]
|
|
lv, ok1 := yearDataListMap[dateItem.EndDate.Year()]
|
|
|
- if dateItem.EndDate.Year() > lastDateT.Year() {
|
|
|
|
|
|
|
+ if changeFlag {
|
|
|
lv, ok1 = yearDataListMap[dateItem.StartDate.Year()]
|
|
lv, ok1 = yearDataListMap[dateItem.StartDate.Year()]
|
|
|
}
|
|
}
|
|
|
if !ok1 {
|
|
if !ok1 {
|
