|
@@ -3363,16 +3363,15 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
|
|
|
err = errors.New("插值处理数据异常, Err:" + err.Error())
|
|
|
return
|
|
|
}
|
|
|
+ if v.ChartLegend == strconv.Itoa(time.Now().Year()) {
|
|
|
+ continue
|
|
|
+ }
|
|
|
for _, date := range dataTimeList {
|
|
|
dateTime, e := time.Parse(utils.FormatDate, date)
|
|
|
if e != nil {
|
|
|
err = errors.New("时间格式化异常, Err:" + e.Error())
|
|
|
return
|
|
|
}
|
|
|
- // 不包含今年
|
|
|
- if dateTime.Year() == time.Now().Year() {
|
|
|
- continue
|
|
|
- }
|
|
|
// 不包含2月29号
|
|
|
if dateTime.Month() == 2 && dateTime.Day() == 29 {
|
|
|
continue
|