Merge branch 'chart/10.5' into debug

models/tables/chart_edb_mapping/query.go

@@ -1,36 +1,39 @@
 package chart_edb_mapping
 
-import "hongze/hongze_yb/global"
+import (
+	"hongze/hongze_yb/global"
+	"time"
+)
 
 type ChartEdbInfoMapping struct {
-	EdbInfoId         int     `description:"指标id"`
-	SourceName        string  `description:"来源名称"`
-	Source            int     `description:"来源id"`
-	EdbCode           string  `description:"指标编码"`
-	EdbName           string  `description:"指标名称"`
-	EdbType           int     `description:"指标类型:1:基础指标,2:计算指标"`
-	Frequency         string  `description:"频率"`
-	Unit              string  `description:"单位"`
-	StartDate         string  `description:"起始日期"`
-	EndDate           string  `description:"终止日期"`
-	ModifyTime        string  `description:"指标最后更新时间"`
-	ChartEdbMappingId int     `description:"图表指标id"`
-	ChartInfoId       int     `description:"图表id"`
-	MaxData           float64 `description:"上限"`
-	MinData           float64 `description:"下限"`
-	IsOrder           bool    `description:"true:正序,false:逆序"`
-	IsAxis            int     `description:"1:左轴,0:右轴"`
-	EdbInfoType       int     `description:"1:标准指标,0:领先指标"`
-	LeadValue         int     `description:"领先值"`
-	LeadUnit          string  `description:"领先单位"`
-	ChartStyle        string  `description:"图表类型"`
-	ChartColor        string  `description:"颜色"`
-	ChartWidth        float64 `description:"线条大小"`
-	LatestDate        string  `description:"数据最新日期"`
-	LatestValue       float64 `description:"数据最新值"`
-	UniqueCode        string  `description:"指标唯一编码"`
-	MinValue          float64 `json:"-" description:"最小值"`
-	MaxValue          float64 `json:"-" description:"最大值"`
+	EdbInfoId         int       `description:"指标id"`
+	SourceName        string    `description:"来源名称"`
+	Source            int       `description:"来源id"`
+	EdbCode           string    `description:"指标编码"`
+	EdbName           string    `description:"指标名称"`
+	EdbType           int       `description:"指标类型:1:基础指标,2:计算指标"`
+	Frequency         string    `description:"频率"`
+	Unit              string    `description:"单位"`
+	StartDate         string    `description:"起始日期"`
+	EndDate           string    `description:"终止日期"`
+	ModifyTime        string    `description:"指标最后更新时间"`
+	ChartEdbMappingId int       `description:"图表指标id"`
+	ChartInfoId       int       `description:"图表id"`
+	MaxData           float64   `description:"上限"`
+	MinData           float64   `description:"下限"`
+	IsOrder           bool      `description:"true:正序,false:逆序"`
+	IsAxis            int       `description:"1:左轴,0:右轴"`
+	EdbInfoType       int       `description:"1:标准指标,0:领先指标"`
+	LeadValue         int       `description:"领先值"`
+	LeadUnit          string    `description:"领先单位"`
+	ChartStyle        string    `description:"图表类型"`
+	ChartColor        string    `description:"颜色"`
+	ChartWidth        float64   `description:"线条大小"`
+	LatestDate        time.Time `description:"数据最新日期"`
+	LatestValue       float64   `description:"数据最新值"`
+	UniqueCode        string    `description:"指标唯一编码"`
+	MinValue          float64   `json:"-" description:"最小值"`
+	MaxValue          float64   `json:"-" description:"最大值"`
 
 	EdbNameEn           string `description:"英文指标名称"`
 	FrequencyEn         string `description:"英文频率"`

services/chart/chart_info.go

@@ -517,7 +517,7 @@ func GetChartEdbData(chartInfoId, chartType int, calendar, startDate, endDate st
 			startDateReal = newStartDateReal.Format(utils.FormatDate)
 		}
 		dataList := make([]*edbDataModel.EdbDataList, 0)
-		//fmt.Println("chart:", v.Source, v.EdbInfoId, startDateReal, endDate)
+		//fmt.Println("chart:", v.Source, v.EdbInfoId, startDateReal, endDate, ";EdbInfoCategoryType:", v.EdbInfoCategoryType)
 
 		switch v.EdbInfoCategoryType {
 		case 0:
@@ -538,12 +538,13 @@ func GetChartEdbData(chartInfoId, chartType int, calendar, startDate, endDate st
 		}
 
 		if chartType == 2 {
-			latestDateStr := v.LatestDate //实际数据的截止日期
-			latestDate, tmpErr := time.Parse(utils.FormatDate, v.LatestDate)
-			if tmpErr != nil {
-				err = errors.New(fmt.Sprint("获取最后实际数据的日期失败,Err:" + tmpErr.Error() + ";LatestDate:" + v.LatestDate))
-				return
-			}
+			latestDateStr := v.LatestDate.Format(utils.FormatDate) //实际数据的截止日期
+			latestDate := v.LatestDate
+			//latestDate, tmpErr := time.Parse(utils.FormatDate, v.LatestDate)
+			//if tmpErr != nil {
+			//	err = errors.New(fmt.Sprint("获取最后实际数据的日期失败,Err:" + tmpErr.Error() + ";LatestDate:" + v.LatestDate))
+			//	return
+			//}
 			latestDateYear := latestDate.Year() //实际数据截止年份
 
 			if calendar == "农历" {