预测指标详情返回父级分类

controllers/data_manage/predict_edb_info.go

@@ -970,9 +970,18 @@ func (this *PredictEdbInfoController) Detail() {
 			calculateList[k] = v
 		}
 	}
+	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.PredictEdbInfo{
-		EdbInfo:       *edbInfo,
+		EdbInfo:       *fullEdb,
 		RuleType:      ruleType,
 		FixedValue:    fixedValue,
 		CalculateList: calculateList,
@@ -1298,9 +1307,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:  edbInfo,
+		EdbInfo:  fullEdb,
 		DataList: resultDataList,
 		Button:   button,
 	}

models/data_manage/response/predit_edb_info.go

@@ -19,18 +19,18 @@ type PredictEdbInfoListResp struct {
 
 // PredictEdbInfoDataResp 预测指标数据返回
 type PredictEdbInfoDataResp struct {
-	EdbInfo  *data_manage.EdbInfo
+	EdbInfo  *data_manage.EdbInfoFullClassify
 	Button   data_manage.EdbClassifyItemsButton
 	DataList interface{}
 }
 
 // PredictEdbInfo 预测指标详情
 type PredictEdbInfo struct {
-	data_manage.EdbInfo
 	RuleType      int                                   `description:"预测规则，1：最新，2：固定值，3：同比，4：同差，5：环比，6：环差，7：N期移动均值，8：N期段线性外推值"`
 	FixedValue    float64                               `description:"固定值"`
 	CalculateList []*data_manage.EdbInfoCalculateDetail `description:"关联指标"`
 	RuleList      []data_manage.PredictEdbConfDetail    `description:"指标规则配置"`
+	EdbInfo       data_manage.EdbInfoFullClassify
 }
 
 // PredictEdbInfoChartDataResp 获取预测指标绘图数据返回