Merge branch 'pool_348_timeline_localtime_adjust' into debug

controllers/data_manage/chart_info.go

@@ -1057,7 +1057,7 @@ func (this *ChartInfoController) ChartInfoDetail() {
 	if dateType == utils.DateTypeNYears {
 		for _, v := range mappingList {
 			if v.LatestDate != "" {
-				lastDateT, tErr := time.Parse(utils.FormatDate, v.LatestDate)
+				lastDateT, tErr := time.ParseInLocation(utils.FormatDate, v.LatestDate, time.Local)
 				if tErr != nil {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取图表日期信息失败，Err:" + tErr.Error()
@@ -1297,7 +1297,7 @@ func (this *ChartInfoController) PreviewChartInfoDetail() {
 			//v.Source = tmpV.Source
 			// 得到指标更新的最新的年份
 			if req.DateType == utils.DateTypeNYears && v.LatestDate != "" {
-				lastDateT, tErr := time.Parse(utils.FormatDate, v.LatestDate)
+				lastDateT, tErr := time.ParseInLocation(utils.FormatDate, v.LatestDate, time.Local)
 				if tErr != nil {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取图表日期信息失败，Err:" + tErr.Error()
@@ -1590,7 +1590,7 @@ func (this *ChartInfoController) ChartInfoDetailV2() {
 	if dateType == utils.DateTypeNYears {
 		for _, v := range mappingList {
 			if v.LatestDate != "" {
-				lastDateT, tErr := time.Parse(utils.FormatDate, v.LatestDate)
+				lastDateT, tErr := time.ParseInLocation(utils.FormatDate, v.LatestDate, time.Local)
 				if tErr != nil {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取图表日期信息失败，Err:" + tErr.Error()

models/data_manage/edb_data_quarter.go

@@ -320,7 +320,7 @@ func AddCalculateQuarterV6(dataList []*EdbDataList) (result *EdbDataResult, err
 	var cureentDate time.Time
 	if thisMonth < 11 {
 		for k, v := range dataList {
-			dateTime, err := time.Parse(utils.FormatDate, v.DataTime)
+			dateTime, err := time.ParseInLocation(utils.FormatDate, v.DataTime, time.Local)
 			if err != nil {
 				errMsg = "time.Parse Err:" + err.Error() + ";DataTime:" + v.DataTime
 				return result, err
@@ -336,7 +336,7 @@ func AddCalculateQuarterV6(dataList []*EdbDataList) (result *EdbDataResult, err
 		}
 	} else {
 		for k, v := range dataList {
-			dateTime, err := time.Parse(utils.FormatDate, v.DataTime)
+			dateTime, err := time.ParseInLocation(utils.FormatDate, v.DataTime, time.Local)
 			if err != nil {
 				errMsg = "time.Parse Err:" + err.Error() + ";DataTime:" + v.DataTime
 				return result, err
@@ -357,7 +357,7 @@ func AddCalculateQuarterV6(dataList []*EdbDataList) (result *EdbDataResult, err
 		if thisMonth < 11 {
 			currentYearCjnl := strconv.Itoa(thisYear) + "-01-01"               //当前年份春节农历
 			currentYearCjgl := solarlunar.LunarToSolar(currentYearCjnl, false) //当前年份春节公历
-			currentYearCjglDate, err := time.Parse(utils.FormatDate, currentYearCjgl)
+			currentYearCjglDate, err := time.ParseInLocation(utils.FormatDate, currentYearCjgl, time.Local)
 			if err != nil {
 				errMsg = "生成当前春节失败,Err:" + err.Error()
 				return result, err
@@ -366,7 +366,7 @@ func AddCalculateQuarterV6(dataList []*EdbDataList) (result *EdbDataResult, err
 			preYear := vy
 			preYearCjnl := strconv.Itoa(preYear) + "-01-01"            //之前年份春节农历
 			preYearCjgl := solarlunar.LunarToSolar(preYearCjnl, false) //之前年份春节公历
-			preYearCjglDate, err := time.Parse(utils.FormatDate, preYearCjgl)
+			preYearCjglDate, err := time.ParseInLocation(utils.FormatDate, preYearCjgl, time.Local)
 			if err != nil {
 				errMsg = "生成历史年份春节失败,Err:" + err.Error()
 				return result, err
@@ -379,7 +379,7 @@ func AddCalculateQuarterV6(dataList []*EdbDataList) (result *EdbDataResult, err
 			items.BetweenDay = int(day) //公历日期换算成农历，需要减除的天数
 			items.Year = preYear
 			for _, v := range dataList {
-				dateTime, err := time.Parse(utils.FormatDate, v.DataTime)
+				dateTime, err := time.ParseInLocation(utils.FormatDate, v.DataTime, time.Local)
 				if err != nil {
 					errMsg = "time.Parse Err:" + err.Error() + ";DataTime:" + v.DataTime
 					return result, err
@@ -400,7 +400,7 @@ func AddCalculateQuarterV6(dataList []*EdbDataList) (result *EdbDataResult, err
 			nextYearCjnl := strconv.Itoa(nextYear) + "-01-01"            //当前年份春节农历
 			nextYearCjgl := solarlunar.LunarToSolar(nextYearCjnl, false) //当前年份春节公历
 
-			nextYearCjglDate, err := time.Parse(utils.FormatDate, nextYearCjgl)
+			nextYearCjglDate, err := time.ParseInLocation(utils.FormatDate, nextYearCjgl, time.Local)
 			if err != nil {
 				errMsg = "生成当前春节失败,Err:" + err.Error()
 				return result, err
@@ -408,7 +408,7 @@ func AddCalculateQuarterV6(dataList []*EdbDataList) (result *EdbDataResult, err
 			preYear := vy
 			preYearCjnl := strconv.Itoa(preYear) + "-01-01"            //之前年份春节农历
 			preYearCjgl := solarlunar.LunarToSolar(preYearCjnl, false) //之前年份春节公历
-			preYearCjglDate, err := time.Parse(utils.FormatDate, preYearCjgl)
+			preYearCjglDate, err := time.ParseInLocation(utils.FormatDate, preYearCjgl, time.Local)
 			if err != nil {
 				errMsg = "生成历史年份春节失败,Err:" + err.Error()
 				return result, err
@@ -419,7 +419,7 @@ func AddCalculateQuarterV6(dataList []*EdbDataList) (result *EdbDataResult, err
 			items.BetweenDay = int(day) //公历日期换算成农历，需要减除的天数
 			items.Year = preYear
 			for _, v := range dataList {
-				dateTime, err := time.Parse(utils.FormatDate, v.DataTime)
+				dateTime, err := time.ParseInLocation(utils.FormatDate, v.DataTime, time.Local)
 				if err != nil {
 					errMsg = "time.Parse Err:" + err.Error() + ";DataTime:" + v.DataTime
 					return result, err

services/data/chart_info.go

@@ -473,7 +473,7 @@ func getEdbDataMapList(chartInfoId, chartType int, calendar, startDate, endDate
 		} else {
 			if v.EdbInfoType == 0 && v.LeadUnit != "" && v.LeadValue > 0 { //领先指标
 				var startTimeRealTemp time.Time
-				startDateParse, _ := time.Parse(utils.FormatDate, startDate)
+				startDateParse, _ := time.ParseInLocation(utils.FormatDate, startDate, time.Local)
 				switch v.LeadUnit {
 				case "天":
 					startTimeRealTemp = startDateParse.AddDate(0, 0, -v.LeadValue)
@@ -515,7 +515,7 @@ func getEdbDataMapList(chartInfoId, chartType int, calendar, startDate, endDate
 		//fmt.Println("line 1011 chart:", v.Source, v.EdbInfoId, startDateReal, endDate)
 		calendarPreYear := 0
 		if calendar == "农历" {
-			newStartDateReal, err := time.Parse(utils.FormatDate, startDateReal)
+			newStartDateReal, err := time.ParseInLocation(utils.FormatDate, startDateReal, time.Local)
 			if err != nil {
 				fmt.Println("time.Parse:" + err.Error())
 			}
@@ -572,7 +572,7 @@ func getEdbDataMapList(chartInfoId, chartType int, calendar, startDate, endDate
 		}
 
 		if chartType == 2 && item.IsAxis == 1 {
-			latestDate, tmpErr := time.Parse(utils.FormatDate, v.LatestDate)
+			latestDate, tmpErr := time.ParseInLocation(utils.FormatDate, v.LatestDate, time.Local)
 			if tmpErr != nil {
 				//item.DataList = dataList
 				item.IsNullData = true
@@ -631,7 +631,7 @@ func getEdbDataMapList(chartInfoId, chartType int, calendar, startDate, endDate
 			if length == 0 {
 				return
 			}
-			latestDate, tmpErr := time.Parse(utils.FormatDate, v.LatestDate)
+			latestDate, tmpErr := time.ParseInLocation(utils.FormatDate, v.LatestDate, time.Local)
 			if tmpErr != nil {
 				//item.DataList = dataList
 				item.IsNullData = true
@@ -646,14 +646,14 @@ func getEdbDataMapList(chartInfoId, chartType int, calendar, startDate, endDate
 				latestDate = latestDate.AddDate(-1, 0, 0)
 			}
 			latestDateStr := fmt.Sprintf("%d-%s", latestDate.Year(), xStartDate)
-			rightAxisDate, err = time.Parse(utils.FormatDate, latestDateStr)
+			rightAxisDate, err = time.ParseInLocation(utils.FormatDate, latestDateStr, time.Local)
 			if err != nil {
 				return
 			}
 
 			newDataList := make([]*data_manage.EdbDataList, 0)
 			for _, v := range dataList {
-				dataTime, e := time.Parse(utils.FormatDate, v.DataTime)
+				dataTime, e := time.ParseInLocation(utils.FormatDate, v.DataTime, time.Local)
 				if e != nil {
 					err = errors.New("季节性图处理右轴指标数据转换日期失败,Err:" + e.Error())
 					return
@@ -711,7 +711,7 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
 	//根据数据确定最早的年份，和最近年份
 	//根据横轴的日期，汇总所有的年份
 	startDate := dataList[0].DataTime
-	startDateT, tmpErr := time.Parse(utils.FormatDate, startDate)
+	startDateT, tmpErr := time.ParseInLocation(utils.FormatDate, startDate, time.Local)
 	if tmpErr != nil {
 		err = tmpErr
 		return
@@ -719,7 +719,7 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
 	startYear := startDateT.Year()
 	//获取数据的最新日期
 	lastDate := dataList[length-1].DataTime
-	lastDateT, tmpErr := time.Parse(utils.FormatDate, lastDate)
+	lastDateT, tmpErr := time.ParseInLocation(utils.FormatDate, lastDate, time.Local)
 	if tmpErr != nil {
 		err = tmpErr
 		return
@@ -745,13 +745,13 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
 		name := fmt.Sprintf("%s_%s", startStr, endStr)
 		showName := fmt.Sprintf("%d_%d", currentStartYear, currentEndYear)
 
-		startT, tEr := time.Parse(utils.FormatDate, startStr)
+		startT, tEr := time.ParseInLocation(utils.FormatDate, startStr, time.Local)
 		if tEr != nil {
 			err = tEr
 			return
 		}
 
-		endT, tEr := time.Parse(utils.FormatDate, endStr)
+		endT, tEr := time.ParseInLocation(utils.FormatDate, endStr, time.Local)
 		if tEr != nil {
 			err = tEr
 			return
@@ -795,7 +795,7 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
 	}
 
 	for _, v := range dataList {
-		dataTimeT, _ := time.Parse(utils.FormatDate, v.DataTime)
+		dataTimeT, _ := time.ParseInLocation(utils.FormatDate, v.DataTime, time.Local)
 		year := dataTimeT.Year()
 		newItemDate := dataTimeT.AddDate(nowYear-year, 0, 0)
 		for k, dateItem := range dataMap {
@@ -810,7 +810,7 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
 				if jumpYear == 1 {
 					//计算前一年最大的日期, 只补齐数据到去年
 					beforeYearMaxDate := fmt.Sprintf("%d-12-31", dateItem.StartDate.Year())
-					beforeYearMaxDateT, _ := time.Parse(utils.FormatDate, beforeYearMaxDate)
+					beforeYearMaxDateT, _ := time.ParseInLocation(utils.FormatDate, beforeYearMaxDate, time.Local)
 					if dataTimeT.Before(beforeYearMaxDateT) || dataTimeT == beforeYearMaxDateT {
 						newItemDate = dataTimeT.AddDate(nowYear-year-1, 0, 0)
 					} else {
@@ -918,7 +918,7 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
 	//获取数据的最新日期
 	lastDate := result.List[length-1].Items[itemLength-1].DataTime
 	maxY := result.List[length-1].Year
-	lastDateT, tmpErr := time.Parse(utils.FormatDate, lastDate)
+	lastDateT, tmpErr := time.ParseInLocation(utils.FormatDate, lastDate, time.Local)
 	if tmpErr != nil {
 		err = tmpErr
 		return
@@ -945,13 +945,13 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
 		endStr := fmt.Sprintf("%d-%s", currentEndYear, xEndDate)
 		showName := fmt.Sprintf("%d_%d", currentStartYear, currentEndYear)
 
-		startT, tEr := time.Parse(utils.FormatDate, startStr)
+		startT, tEr := time.ParseInLocation(utils.FormatDate, startStr, time.Local)
 		if tEr != nil {
 			err = tEr
 			return
 		}
 
-		endT, tEr := time.Parse(utils.FormatDate, endStr)
+		endT, tEr := time.ParseInLocation(utils.FormatDate, endStr, time.Local)
 		if tEr != nil {
 			err = tEr
 			return
@@ -1042,7 +1042,7 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
 				DataTimestamp: item.DataTimestamp,
 				Value:         item.Value,
 			}
-			dataTimeT, _ := time.Parse(utils.FormatDate, item.DataTime)
+			dataTimeT, _ := time.ParseInLocation(utils.FormatDate, item.DataTime, time.Local)
 			if (startTmpT.Before(dataTimeT) && endTmpT.After(dataTimeT)) || startTmpT == dataTimeT || endTmpT == dataTimeT {
 				tmpV := &tmpVal
 				if findVal, ok := quarterMap[name]; !ok {
@@ -3629,12 +3629,12 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 
 			startDateStr = fmt.Sprintf("%d-%s", time.Now().Year(), seasonConfig.XStartDate)
 			endDateStr = fmt.Sprintf("%d-%s", time.Now().Year(), seasonConfig.XEndDate)
-			startDate, e := time.Parse(utils.FormatDate, startDateStr)
+			startDate, e := time.ParseInLocation(utils.FormatDate, startDateStr, time.Local)
 			if e != nil {
 				err = e
 				return
 			}
-			endDate, e := time.Parse(utils.FormatDate, endDateStr)
+			endDate, e := time.ParseInLocation(utils.FormatDate, endDateStr, time.Local)
 			if e != nil {
 				err = e
 				return
@@ -3653,7 +3653,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 						continue
 					}
 					for _, date := range dataTimeList {
-						dateTime, e := time.Parse(utils.FormatDate, date)
+						dateTime, e := time.ParseInLocation(utils.FormatDate, date, time.Local)
 						if e != nil {
 							err = errors.New("时间格式化异常, Err:" + e.Error())
 							return
@@ -3769,7 +3769,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 				} else {
 					// 旬度、月度、季度、半年度 不插值，需要先把日期列表和数据map取出来
 					for _, vv := range v.DataList {
-						dateTime, e := time.Parse(utils.FormatDate, vv.DataTime)
+						dateTime, e := time.ParseInLocation(utils.FormatDate, vv.DataTime, time.Local)
 						if e != nil {
 							err = errors.New("时间格式化异常, Err:" + e.Error())
 							return
@@ -3942,7 +3942,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 					return
 				}
 				for _, date := range dataTimeList {
-					dateTime, e := time.Parse(utils.FormatDate, date)
+					dateTime, e := time.ParseInLocation(utils.FormatDate, date, time.Local)
 					if e != nil {
 						err = errors.New("时间格式化异常, Err:" + e.Error())
 						return
@@ -4026,7 +4026,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 					return
 				}
 				for _, date := range dataTimeList {
-					dateTime, e := time.Parse(utils.FormatDate, date)
+					dateTime, e := time.ParseInLocation(utils.FormatDate, date, time.Local)
 					if e != nil {
 						err = errors.New("时间格式化异常, Err:" + e.Error())
 						return
@@ -4089,7 +4089,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 		// 自定义右轴
 		if seasonConfig.RightAxis.IndicatorType != 0 {
 			if seasonConfig.RightAxis.IndicatorType == 1 {
-				startTime, _ := time.Parse(utils.FormatDate, mappingItem.StartDate)
+				startTime, _ := time.ParseInLocation(utils.FormatDate, mappingItem.StartDate, time.Local)
 				for i := len(quarterDataList) - 1; i > len(quarterDataList)-2 && i > 0; i-- {
 					var rightMappingItem data_manage.ChartEdbInfoMapping
 					rightMappingItem = *mappingItem
@@ -4788,7 +4788,7 @@ func getEdbDataMapListForSeason(chartInfoId, chartType int, calendar, startDate,
 		} else {
 			if v.EdbInfoType == 0 && v.LeadUnit != "" && v.LeadValue > 0 { //领先指标
 				var startTimeRealTemp time.Time
-				startDateParse, _ := time.Parse(utils.FormatDate, startDate)
+				startDateParse, _ := time.ParseInLocation(utils.FormatDate, startDate, time.Local)
 				switch v.LeadUnit {
 				case "天":
 					startTimeRealTemp = startDateParse.AddDate(0, 0, -v.LeadValue)
@@ -4830,7 +4830,7 @@ func getEdbDataMapListForSeason(chartInfoId, chartType int, calendar, startDate,
 		//fmt.Println("line 1011 chart:", v.Source, v.EdbInfoId, startDateReal, endDate)
 		calendarPreYear := 0
 		if calendar == "农历" {
-			newStartDateReal, err := time.Parse(utils.FormatDate, startDateReal)
+			newStartDateReal, err := time.ParseInLocation(utils.FormatDate, startDateReal, time.Local)
 			if err != nil {
 				fmt.Println("time.Parse:" + err.Error())
 			}
@@ -4898,7 +4898,7 @@ func getEdbDataMapListForSeason(chartInfoId, chartType int, calendar, startDate,
 		}
 
 		if chartType == 2 && item.IsAxis == 1 {
-			latestDate, tmpErr := time.Parse(utils.FormatDate, v.LatestDate)
+			latestDate, tmpErr := time.ParseInLocation(utils.FormatDate, v.LatestDate, time.Local)
 			if tmpErr != nil {
 				//item.DataList = newDataList
 				item.IsNullData = true
@@ -4957,7 +4957,7 @@ func getEdbDataMapListForSeason(chartInfoId, chartType int, calendar, startDate,
 			if length == 0 {
 				return
 			}
-			latestDate, tmpErr := time.Parse(utils.FormatDate, v.LatestDate)
+			latestDate, tmpErr := time.ParseInLocation(utils.FormatDate, v.LatestDate, time.Local)
 			if tmpErr != nil {
 				//item.DataList = newDataList
 				item.IsNullData = true
@@ -4972,14 +4972,14 @@ func getEdbDataMapListForSeason(chartInfoId, chartType int, calendar, startDate,
 				latestDate = latestDate.AddDate(-1, 0, 0)
 			}
 			latestDateStr := fmt.Sprintf("%d-%s", latestDate.Year(), xStartDate)
-			rightAxisDate, err = time.Parse(utils.FormatDate, latestDateStr)
+			rightAxisDate, err = time.ParseInLocation(utils.FormatDate, latestDateStr, time.Local)
 			if err != nil {
 				return
 			}
 
 			newList := make([]*data_manage.EdbDataList, 0)
 			for _, v := range newDataList {
-				dataTime, e := time.Parse(utils.FormatDate, v.DataTime)
+				dataTime, e := time.ParseInLocation(utils.FormatDate, v.DataTime, time.Local)
 				if e != nil {
 					err = errors.New("季节性图处理右轴指标数据转换日期失败,Err:" + e.Error())
 					return

services/data/chart_info_excel_balance.go

@@ -753,7 +753,7 @@ func GetBalanceExcelEdbDataMapList(chartInfoId, chartType int, calendar, startDa
 		} else {
 			if v.EdbInfoType == 0 && v.LeadUnit != "" && v.LeadValue > 0 { //领先指标
 				var startTimeRealTemp time.Time
-				startDateParse, _ := time.Parse(utils.FormatDate, startDate)
+				startDateParse, _ := time.ParseInLocation(utils.FormatDate, startDate, time.Local)
 				switch v.LeadUnit {
 				case "天":
 					startTimeRealTemp = startDateParse.AddDate(0, 0, -v.LeadValue)
@@ -795,7 +795,7 @@ func GetBalanceExcelEdbDataMapList(chartInfoId, chartType int, calendar, startDa
 		//fmt.Println("line 1011 chart:", v.Source, v.EdbInfoId, startDateReal, endDate)
 		calendarPreYear := 0
 		if calendar == "农历" {
-			newStartDateReal, e := time.Parse(utils.FormatDate, startDateReal)
+			newStartDateReal, e := time.ParseInLocation(utils.FormatDate, startDateReal, time.Local)
 			if e != nil {
 				err = fmt.Errorf("时间解析 time.Parse(%s, %s) error: %v", utils.FormatDate, startDateReal, e)
 				return
@@ -853,7 +853,7 @@ func GetBalanceExcelEdbDataMapList(chartInfoId, chartType int, calendar, startDa
 		}
 
 		if chartType == 2 && item.IsAxis == 1 {
-			latestDate, tmpErr := time.Parse(utils.FormatDate, v.LatestDate)
+			latestDate, tmpErr := time.ParseInLocation(utils.FormatDate, v.LatestDate, time.Local)
 			if tmpErr != nil {
 				//item.DataList = dataList
 				item.IsNullData = true
@@ -910,7 +910,7 @@ func GetBalanceExcelEdbDataMapList(chartInfoId, chartType int, calendar, startDa
 			if length == 0 {
 				return
 			}
-			latestDate, tmpErr := time.Parse(utils.FormatDate, v.LatestDate)
+			latestDate, tmpErr := time.ParseInLocation(utils.FormatDate, v.LatestDate, time.Local)
 			if tmpErr != nil {
 				//item.DataList = dataList
 				item.IsNullData = true
@@ -924,7 +924,7 @@ func GetBalanceExcelEdbDataMapList(chartInfoId, chartType int, calendar, startDa
 			if jumpYear == 1 {
 				latestDate = latestDate.AddDate(-1, 0, 0)
 				latestDateStr := fmt.Sprintf("%d-%s", latestDate.Year(), xStartDate)
-				rightAxisDate, err = time.Parse(utils.FormatDate, latestDateStr)
+				rightAxisDate, err = time.ParseInLocation(utils.FormatDate, latestDateStr, time.Local)
 				if err != nil {
 					return
 				}
@@ -932,7 +932,7 @@ func GetBalanceExcelEdbDataMapList(chartInfoId, chartType int, calendar, startDa
 
 			newDataList := make([]*data_manage.EdbDataList, 0)
 			for _, v := range dataList {
-				dataTime, e := time.Parse(utils.FormatDate, v.DataTime)
+				dataTime, e := time.ParseInLocation(utils.FormatDate, v.DataTime, time.Local)
 				if e != nil {
 					err = errors.New("季节性图处理右轴指标数据转换日期失败,Err:" + e.Error())
 					return

utils/common.go

@@ -1755,7 +1755,7 @@ func GetDateByDateTypeV2(dateType int, tmpStartDate, tmpEndDate string, startYea
 			return
 		}
 		startYear = startYear - 1
-		baseDate, _ := time.Parse(FormatDate, fmt.Sprintf("%d-01-01", yearMax))
+		baseDate, _ := time.ParseInLocation(FormatDate, fmt.Sprintf("%d-01-01", yearMax), time.Local)
 		startDate = baseDate.AddDate(-startYear, 0, 0).Format(FormatDate)
 		endDate = ""
 	}
@@ -1766,7 +1766,7 @@ func GetDateByDateTypeV2(dateType int, tmpStartDate, tmpEndDate string, startYea
 			startDate = startDate + "-01"
 		}
 		if strings.Count(endDate, "-") == 1 {
-			endTime, err := time.Parse(FormatYearMonthDate, endDate)
+			endTime, err := time.ParseInLocation(FormatYearMonthDate, endDate, time.Local)
 			if err != nil {
 				return
 			}