指标搜索 增加返回值

controllers/data_manage/edb_info_calculate.go

@@ -2091,9 +2091,9 @@ func (this *ChartInfoController) CalculateMultiSearch() {
 		return
 	}
 
-	searchItemList := make([]data_manage.EdbInfoBase, 0)
+	searchItemList := make([]data_manage.CalculateMultiEdbSearchItem, 0)
 	page := paging.GetPaging(currentIndex, pageSize, total)
-	resp := new(data_manage.CalculateMultiChoiceResp)
+	resp := new(data_manage.CalculateMultiEdbSearchResp)
 
 	edbList, e := data_manage.GetEdbInfoListByCondition(condition, pars, startSize, pageSize)
 	if e != nil {
@@ -2114,12 +2114,16 @@ func (this *ChartInfoController) CalculateMultiSearch() {
 			return
 		}
 		for _, info := range list {
-			searchItem := data_manage.EdbInfoBase{
-				Frequency:  info.Frequency,
-				Unit:       info.Unit,
-				EdbName:    info.EdbName,
-				EdbInfoId:  info.EdbInfoId,
-				ClassifyId: info.ClassifyId,
+			searchItem := data_manage.CalculateMultiEdbSearchItem{
+				Frequency:       info.Frequency,
+				Unit:            info.Unit,
+				EdbName:         info.EdbName,
+				EdbInfoId:       info.EdbInfoId,
+				ClassifyId:      info.ClassifyId,
+				SysUserRealName: info.SysUserRealName,
+				SysUserId:       info.SysUserId,
+				EndDate:         info.EndDate,
+				EndValue:        info.EndValue,
 			}
 			searchItemList = append(searchItemList, searchItem)
 		}

models/data_manage/edb_info_calculate.go

@@ -584,5 +584,20 @@ type CalculateMultiChoiceReq struct {
 
 type CalculateMultiChoiceResp struct {
 	SearchItem []EdbInfoBase `description:"查询结果"`
+}
+
+type CalculateMultiEdbSearchResp struct {
+	SearchItem []CalculateMultiEdbSearchItem `description:"查询结果"`
 	Paging     *paging.PagingItem
 }
+type CalculateMultiEdbSearchItem struct {
+	EdbInfoId       int    `description:"指标id"`
+	EdbName         string `description:"指标名称"`
+	Frequency       string `description:"频度"`
+	Unit            string `description:"单位"`
+	ClassifyId      int    `description:"分类id"`
+	SysUserId       int
+	SysUserRealName string
+	EndValue        float64 `description:"数据的最新值（预测日期的最新值）"`
+	EndDate         string  `description:"终止日期"`
+}