Merge branch 'refs/heads/eta_2.1.3_manual_data_0828@guomengyuan' into debug

# Conflicts:
#	go.mod

controllers/data_manage/manual_edb.go

@@ -128,6 +128,7 @@ func fillDataNextDateTime(list []*models.Edbdata) ([]*models.Edbdata, error) {
 		return nil, nil
 	}
 	nextDataDateTime := models.Edbdata{}
+	nextDataDateTime.TradeCode = list[0].TradeCode
 	indexCodes := []string{list[0].TradeCode}
 	edbinfoList, err := models.GetEdbinfoListByCodeListByCodeIdList(indexCodes)
 	if err != nil {
@@ -155,7 +156,8 @@ func fillDataNextDateTime(list []*models.Edbdata) ([]*models.Edbdata, error) {
 	case "年度":
 		nextDataDateTime.Dt = date.AddDate(1, 0, 0).Format(utils.FormatDate)
 	}
-	list = append(list, &nextDataDateTime)
+	// nextDataDateTime 添加到list第一个
+	list = append([]*models.Edbdata{&nextDataDateTime}, list...)
 	return list, nil
 }
 

models/target.go

@@ -72,6 +72,15 @@ type Edbdata struct {
 	ModifyTime time.Time `orm:"column(modify_time)" description:"修改时间"`
 }
 
+type EdbDataNextDateTime struct {
+	TradeCode  string    `orm:"column(TRADE_CODE);pk" description:"指标编码"`
+	Dt         string    `orm:"column(DT)" description:"日期"`
+	Close      string    `orm:"column(CLOSE)" description:"值"`
+	ModifyTime time.Time `orm:"column(modify_time)" description:"修改时间"`
+
+	NextDateTime string `description:"下期日期"`
+}
+
 func GetDataInfo(tradeCode, creteDate string) (item *Edbdata, err error) {
 	sql := " SELECT * FROM edbdata WHERE TRADE_CODE=? AND DT=? "
 	o := orm.NewOrmUsingDB("edb")
@@ -1265,26 +1274,27 @@ func GetLzFrequency(productName string) (items []*int, err error) {
 
 // EdbInfoItem
 type EdbInfoItem struct {
-	TradeCode    string     `orm:"column(TRADE_CODE);pk" description:"指标code"`
-	SecName      string     `orm:"column(SEC_NAME);" description:"指标名称"`
-	Unit         string     `orm:"column(UNIT);" description:"单位"`
-	Remark       string     `orm:"column(REMARK);" description:"备注"`
-	Frequency    string     `description:"频度"`
-	ClassifyId   int        `description:"分类id"`
-	ClassifyName string     `description:"分类名称"`
-	CreateDate   string     `description:"创建时间"`
-	UserId       int        `description:"录入用户id"`
-	UserName     string     `description:"录入用户名称"`
-	NoticeTime   string     `description:"通知时间"`
-	Mobile       string     `description:"录入者手机号"`
-	ModifyDate   string     `description:"待更新日期"`
-	ModifyTime   string     `description:"最近一次更新时间"`
-	Status       string     `description:"状态：未完成/完成"`
-	IsJoinEdb    int8       `description:"指标库是否已添加：0-否；1-是"`
-	StartDate    string     `description:"数据开始日期"`
-	EndDate      string     `description:"数据结束日期"`
-	LatestValue  float64    `description:"指标最新值"`
-	DataList     []*Edbdata `description:"指标数据列表"`
+	TradeCode        string                 `orm:"column(TRADE_CODE);pk" description:"指标code"`
+	SecName          string                 `orm:"column(SEC_NAME);" description:"指标名称"`
+	Unit             string                 `orm:"column(UNIT);" description:"单位"`
+	Remark           string                 `orm:"column(REMARK);" description:"备注"`
+	Frequency        string                 `description:"频度"`
+	ClassifyId       int                    `description:"分类id"`
+	ClassifyName     string                 `description:"分类名称"`
+	CreateDate       string                 `description:"创建时间"`
+	UserId           int                    `description:"录入用户id"`
+	UserName         string                 `description:"录入用户名称"`
+	NoticeTime       string                 `description:"通知时间"`
+	Mobile           string                 `description:"录入者手机号"`
+	ModifyDate       string                 `description:"待更新日期"`
+	ModifyTime       string                 `description:"最近一次更新时间"`
+	Status           string                 `description:"状态：未完成/完成"`
+	IsJoinEdb        int8                   `description:"指标库是否已添加：0-否；1-是"`
+	StartDate        string                 `description:"数据开始日期"`
+	EndDate          string                 `description:"数据结束日期"`
+	LatestValue      float64                `description:"指标最新值"`
+	DataList         []*Edbdata             `description:"指标数据列表"`
+	NextDataTimeList []*EdbDataNextDateTime `description:"下期数据时间列表"`
 }
 
 // GetTargetItemList 获取指标列表数据