预测截止期数

controllers/data_manage/predict_edb_info.go

@@ -926,7 +926,6 @@ func (this *PredictEdbInfoController) Detail() {
 				ModifyTime:       v.ModifyTime,
 				CreateTime:       v.CreateTime,
 				CalculateList:    tmpPredictEdbConfCalculateMappingDetail,
-				EndDateType:      v.EndDateType,
 				EndNum:           v.EndNum,
 			}
 			predictEdbConfList = append(predictEdbConfList, tmp)

models/data_manage/predict_edb_conf.go

@@ -19,7 +19,6 @@ type PredictEdbConf struct {
 	EndDate          time.Time `description:"截止日期"`
 	ModifyTime       time.Time `description:"修改时间"`
 	CreateTime       time.Time `description:"添加时间"`
-	EndDateType      int       `description:"截止日期类型：0：未来时间，1未来期数"`
 	EndNum           int       `description:"截止期数"`
 }
 
@@ -37,7 +36,6 @@ type PredictEdbConfDetail struct {
 	ModifyTime       time.Time                               `description:"修改时间"`
 	CreateTime       time.Time                               `description:"添加时间"`
 	CalculateList    []*PredictEdbConfCalculateMappingDetail `description:"配置与指标的关联信息"`
-	EndDateType      int                                     `description:"截止日期类型：0：未来时间，1未来期数"`
 	EndNum           int                                     `description:"截止期数"`
 }
 
@@ -50,6 +48,7 @@ type PredictEdbConfAndData struct {
 	FixedValue       float64        `description:"固定值"`
 	Value            string         `description:"配置的值"`
 	EndDate          time.Time      `description:"截止日期"`
+	EndNum           int            `description:"截止期数"`
 	ModifyTime       time.Time      `description:"修改时间"`
 	CreateTime       time.Time      `description:"添加时间"`
 	DataList         []*EdbDataList `description:"动态数据"`