农历季节性图

services/data/chart_info.go

@@ -535,7 +535,7 @@ func GetChartEdbData(chartInfoId, chartType int, calendar, startDate, endDate st
 			err = errors.New(errMsg)
 			return
 		}
-		
+
 		extraConfig = tmpExtraConfig
 
 	default:
@@ -1096,6 +1096,9 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
 
 	//判断哪些点应该落在同一条时间线上
 	maxY := lastDateT.Year()
+	if lastDateT.Month() >= 11 {
+		maxY = maxY + 1
+	}
 	endTmp := fmt.Sprintf("%d-%s", maxY, xEndDate)
 	endTmpT, _ := time.Parse(utils.FormatDate, endTmp)
 	minY := maxY
@@ -1122,9 +1125,9 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
 				Value:         item.Value,
 			}
 			dataTimeT, _ := time.Parse(utils.FormatDate, item.DataTime)
-			year := dataTimeT.Year()
-			newItemDate := dataTimeT.AddDate(nowYear-year, 0, 0)
-			if dateItem.EndDate.Year() > maxY {
+			//year := dataTimeT.Year()
+			//newItemDate := dataTimeT.AddDate(nowYear-year, 0, 0)
+			/*if dateItem.EndDate.Year() > maxY {
 				if (dateItem.StartDate.Before(dataTimeT) && dateItem.EndDate.After(dataTimeT)) || dateItem.StartDate == dataTimeT || dateItem.EndDate == dataTimeT {
 					if jumpYear == 1 {
 						//计算前一年最大的日期, 只补齐数据到去年
@@ -1157,43 +1160,43 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
 						}
 					}
 				}
-			} else {
-				if (startTmpT.Before(dataTimeT) && endTmpT.After(dataTimeT)) || startTmpT == dataTimeT || endTmpT == dataTimeT {
-					if jumpYear == 1 {
-						//计算前一年最大的日期, 只补齐数据到去年
-						beforeYearMaxDate := fmt.Sprintf("%d-12-31", startTmpT.Year())
-						beforeYearMaxDateT, _ := time.Parse(utils.FormatDate, beforeYearMaxDate)
-						if dataTimeT.Before(beforeYearMaxDateT) || dataTimeT == beforeYearMaxDateT {
-							newItemDate = dataTimeT.AddDate(nowYear-year-1, 0, 0)
-						} else {
-							newItemDate = dataTimeT.AddDate(nowYear-year, 0, 0)
-						}
+			} else {*/
+			if (startTmpT.Before(dataTimeT) && endTmpT.After(dataTimeT)) || startTmpT == dataTimeT || endTmpT == dataTimeT {
+				/*if jumpYear == 1 {
+					//计算前一年最大的日期, 只补齐数据到去年
+					beforeYearMaxDate := fmt.Sprintf("%d-12-31", startTmpT.Year())
+					beforeYearMaxDateT, _ := time.Parse(utils.FormatDate, beforeYearMaxDate)
+					if dataTimeT.Before(beforeYearMaxDateT) || dataTimeT == beforeYearMaxDateT {
+						newItemDate = dataTimeT.AddDate(nowYear-year-1, 0, 0)
 					} else {
 						newItemDate = dataTimeT.AddDate(nowYear-year, 0, 0)
 					}
-					timestamp := newItemDate.UnixNano() / 1e6
-					tmpVal.DataTimestamp = timestamp
-					tmpV := &tmpVal
-					if findVal, ok := quarterMap[name]; !ok {
-						findVal = append(findVal, tmpV)
-						quarterMap[name] = findVal
-					} else {
-						findVal = append(findVal, tmpV)
-						quarterMap[name] = findVal
-					}
-					if lv.Year >= latestDateYear {
-						// 切割的日期时间字符串
-						cuttingDataTimeStr := latestDate.AddDate(0, 0, lv.BetweenDay).Format(utils.FormatDate)
-						if item.DataTime == cuttingDataTimeStr {
-							dateItem.CuttingDataTimestamp = timestamp
-							dataMap[name] = dateItem
-						}
+				} else {
+					newItemDate = dataTimeT.AddDate(nowYear-year, 0, 0)
+				}
+				timestamp := newItemDate.UnixNano() / 1e6
+				tmpVal.DataTimestamp = timestamp*/
+				tmpV := &tmpVal
+				if findVal, ok := quarterMap[name]; !ok {
+					findVal = append(findVal, tmpV)
+					quarterMap[name] = findVal
+				} else {
+					findVal = append(findVal, tmpV)
+					quarterMap[name] = findVal
+				}
+				if lv.Year >= latestDateYear {
+					// 切割的日期时间字符串
+					cuttingDataTimeStr := latestDate.AddDate(0, 0, lv.BetweenDay).Format(utils.FormatDate)
+					if item.DataTime == cuttingDataTimeStr {
+						dateItem.CuttingDataTimestamp = tmpVal.DataTimestamp
+						dataMap[name] = dateItem
 					}
 				}
 			}
 		}
-
 	}
+
+	//}
 	for k, v := range dataMap {
 		itemList := quarterMap[k]
 		quarterItem := new(data_manage.QuarterData)