|
@@ -3901,6 +3901,11 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
|
|
|
if v.ChartLegend == strconv.Itoa(time.Now().Year()) {
|
|
|
continue
|
|
|
}
|
|
|
+ // 农历时dataTimeList的年份为最新年份,图例时间的年份才是真实年份
|
|
|
+ chartLegend,_ := strconv.Atoi(v.ChartLegend)
|
|
|
+ if chartLegend < startYear {
|
|
|
+ continue
|
|
|
+ }
|
|
|
for _, date := range dataTimeList {
|
|
|
dateTime, e := time.Parse(utils.FormatDate, date)
|
|
|
if e != nil {
|
|
@@ -4200,6 +4205,11 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
|
|
|
if dateTime.Year() < startYear {
|
|
|
continue
|
|
|
}
|
|
|
+ // 农历时dataTimeList的年份为最新年份,图例时间的年份才是真实年份
|
|
|
+ chartLegend,_ := strconv.Atoi(quarterDataList[i].ChartLegend)
|
|
|
+ if chartLegend < startYear {
|
|
|
+ continue
|
|
|
+ }
|
|
|
// 不包含2月29号
|
|
|
if dateTime.Month() == 2 && dateTime.Day() == 29 {
|
|
|
continue
|
|
@@ -4283,6 +4293,11 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
|
|
|
if dateTime.Year() < startYear {
|
|
|
continue
|
|
|
}
|
|
|
+ // 农历时dataTimeList的年份为最新年份,图例时间的年份才是真实年份
|
|
|
+ chartLegend,_ := strconv.Atoi(quarterDataList[i].ChartLegend)
|
|
|
+ if chartLegend < startYear {
|
|
|
+ continue
|
|
|
+ }
|
|
|
// 不包含2月29号
|
|
|
if dateTime.Month() == 2 && dateTime.Day() == 29 {
|
|
|
continue
|