预测指标分类列表调整

controllers/data_manage/predict_edb_info.go

@@ -1305,19 +1305,17 @@ func (this *PredictEdbInfoController) DataList() {
 		br.ErrMsg = "获取失败,Err:" + err.Error()
 		return
 	}
-	fullEdb := new(data_manage.EdbInfoFullClassify)
 	classifyList, err, errMsg := data.GetFullClassifyByClassifyId(edbInfo.ClassifyId)
 	if err != nil {
 		br.Msg = err.Error()
 		br.ErrMsg = errMsg
 		return
 	}
-	fullEdb.EdbInfo = edbInfo
-	fullEdb.ClassifyList = classifyList
 	resp := response.PredictEdbInfoDataResp{
-		EdbInfo:  fullEdb,
-		DataList: resultDataList,
-		Button:   button,
+		EdbInfo:      edbInfo,
+		DataList:     resultDataList,
+		Button:       button,
+		ClassifyList: classifyList,
 	}
 	br.Ret = 200
 	br.Success = true

models/data_manage/response/predit_edb_info.go

@@ -19,9 +19,10 @@ type PredictEdbInfoListResp struct {
 
 // PredictEdbInfoDataResp 预测指标数据返回
 type PredictEdbInfoDataResp struct {
-	EdbInfo  *data_manage.EdbInfoFullClassify
-	Button   data_manage.EdbClassifyItemsButton
-	DataList interface{}
+	EdbInfo      *data_manage.EdbInfo
+	Button       data_manage.EdbClassifyItemsButton
+	DataList     interface{}
+	ClassifyList []*data_manage.EdbClassifyIdItems `description:"父级分类列表"`
 }
 
 // PredictEdbInfo 预测指标详情
@@ -31,7 +32,7 @@ type PredictEdbInfo struct {
 	FixedValue    float64                               `description:"固定值"`
 	CalculateList []*data_manage.EdbInfoCalculateDetail `description:"关联指标"`
 	RuleList      []data_manage.PredictEdbConfDetail    `description:"指标规则配置"`
-	ClassifyList  []*data_manage.EdbClassifyIdItems
+	ClassifyList  []*data_manage.EdbClassifyIdItems     `description:"父级分类列表"`
 }
 
 // PredictEdbInfoChartDataResp 获取预测指标绘图数据返回