fix bug

controllers/chart.go

@@ -144,11 +144,11 @@ func (this *ChartController) ChartInfoDetail() {
 		item.EdbCode = v.EdbCode
 		item.EdbName = v.EdbName
 		item.Frequency = v.Frequency
-		item.Unit = v.Unit
+		//item.Unit = v.Unit
 		item.StartDate = v.StartDate
 		item.EndDate = v.EndDate
-		item.ModifyTime = v.ModifyTime
-		item.ChartEdbMappingId = v.ChartEdbMappingId
+		//item.ModifyTime = v.ModifyTime
+		//item.ChartEdbMappingId = v.ChartEdbMappingId
 		item.ChartInfoId = v.ChartInfoId
 		item.MaxData = v.MaxData
 		item.MinData = v.MinData

models/chart.go

@@ -12,24 +12,24 @@ import (
 )
 
 type ChartInfo struct {
-	ChartInfoId     int    `orm:"column(chart_info_id);pk"`
-	ChartName       string `description:"来源名称"`
-	ChartClassifyId int    `description:"图表分类id"`
-	SysUserId       int
-	SysUserRealName string
-	UniqueCode      string `description:"图表唯一编码"`
-	CreateTime      time.Time
-	ModifyTime      time.Time
-	DateType        int    `description:"日期类型:1:00年至今,2:10年至今,3:15年至今，4：年初至今，5:自定义时间"`
-	StartDate       string `description:"自定义开始日期"`
-	EndDate         string `description:"自定义结束日期"`
-	IsSetName       int    `description:"设置名称"`
-	EdbInfoIds      string `description:"指标id"`
-	ChartType       int    `description:"生成样式:1:曲线图,2:季节性图"`
-	Calendar        string `description:"公历/农历"`
-	SeasonStartDate string `description:"季节性图开始日期"`
-	SeasonEndDate   string `description:"季节性图开始日期"`
-	ChartImage      string `description:"图表图片"`
+	ChartInfoId     int       `orm:"column(chart_info_id);pk"`
+	ChartName       string    `description:"来源名称"`
+	ChartClassifyId int       `json:"-" description:"图表分类id"`
+	SysUserId       int       `json:"-"`
+	SysUserRealName string    `json:"-"`
+	UniqueCode      string    `description:"图表唯一编码"`
+	CreateTime      time.Time `json:"-"`
+	ModifyTime      time.Time `json:"-"`
+	DateType        int       `description:"日期类型:1:00年至今,2:10年至今,3:15年至今，4：年初至今，5:自定义时间"`
+	StartDate       string    `description:"自定义开始日期"`
+	EndDate         string    `description:"自定义结束日期"`
+	IsSetName       int       `description:"设置名称"`
+	EdbInfoIds      string    `description:"指标id"`
+	ChartType       int       `description:"生成样式:1:曲线图,2:季节性图"`
+	Calendar        string    `description:"公历/农历"`
+	SeasonStartDate string    `description:"季节性图开始日期"`
+	SeasonEndDate   string    `description:"季节性图开始日期"`
+	ChartImage      string    `description:"图表图片"`
 }
 
 func GetChartInfoByUniqueCode(uniqueCode string) (item *ChartInfo, err error) {
@@ -41,29 +41,29 @@ func GetChartInfoByUniqueCode(uniqueCode string) (item *ChartInfo, err error) {
 }
 
 type ChartEdbInfoMapping struct {
-	EdbInfoId         int     `description:"指标id"`
-	SourceName        string  `description:"来源名称"`
-	Source            int     `description:"来源id"`
-	EdbCode           string  `description:"指标编码"`
-	EdbName           string  `description:"指标名称"`
-	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:"线条大小"`
-	DataList          interface{}
+	EdbInfoId  int    `description:"指标id"`
+	SourceName string `description:"来源名称"`
+	Source     int    `description:"来源id"`
+	EdbCode    string `description:"指标编码"`
+	EdbName    string `description:"指标名称"`
+	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:"线条大小"`
+	DataList    interface{}
 }
 
 func GetChartEdbMappingList(chartInfoId int) (list []*ChartEdbInfoMapping, err error) {
@@ -86,7 +86,6 @@ type EdbDataList struct {
 	Value         float64 `description:"数据值"`
 }
 
-
 func GetEdbDataList(source, endInfoId int, startDate, endDate string) (list []*EdbDataList, err error) {
 	tableName := GetEdbDataTableName(source)
 	if tableName == "" {
@@ -102,7 +101,6 @@ func GetEdbDataList(source, endInfoId int, startDate, endDate string) (list []*E
 	return
 }
 
-
 //指标季度数据计算(公历转农历)
 func AddCalculateQuarterV4(dataList []*EdbDataList) (result *EdbDataResult, err error) {
 	var errMsg string
@@ -228,7 +226,7 @@ func AddCalculateQuarterV4(dataList []*EdbDataList) (result *EdbDataResult, err
 				if newDate.Before(selectDate) {
 					timestamp := newDate.UnixNano() / 1e6
 					item := new(EdbDataList)
-					item.DataTime =newDate.Format(utils.FormatDate)
+					item.DataTime = newDate.Format(utils.FormatDate)
 					item.EdbInfoId = v.EdbInfoId
 					item.Value = v.Value
 					item.EdbDataId = v.EdbDataId
@@ -259,4 +257,4 @@ type QuarterData struct {
 type ChartInfoDetailResp struct {
 	ChartInfo   *ChartInfo
 	EdbInfoList []*ChartEdbInfoMapping
-}
+}