fix:修复添加指标校验时，不列表全选的bug

controllers/data_manage/business_data.go

@@ -200,7 +200,7 @@ func (c *EdbBusinessController) AddCheck() {
 	existsEdb, e := data_manage.GetEdbCodesBySource(utils.DATA_SOURCE_BUSINESS)
 	if e != nil {
 		br.Msg = "获取失败"
-		br.ErrMsg = "获取Bloomberg已添加的指标失败, Err: " + e.Error()
+		br.ErrMsg = "获取外部数据已添加的指标失败, Err: " + e.Error()
 		return
 	}
 	existMap := make(map[string]*data_manage.EdbInfo)
@@ -228,7 +228,7 @@ func (c *EdbBusinessController) AddCheck() {
 		list, e = obj.GeItemsByCondition(cond, pars, 0)
 		if e != nil {
 			br.Msg = "获取失败"
-			br.ErrMsg = "获取Bloomberg原始指标列表失败, Err: " + e.Error()
+			br.ErrMsg = "获取外部数据原始指标列表失败, Err: " + e.Error()
 			return
 		}
 	} else {
@@ -272,7 +272,7 @@ func (c *EdbBusinessController) AddCheck() {
 
 		// 排除对应指标
 		if codeLen > 0 {
-			condition += fmt.Sprintf(` AND a.%s NOT IN (%s)`, data_manage.BaseFromBloombergIndexCols.IndexCode, utils.GetOrmInReplace(codeLen))
+			condition += fmt.Sprintf(` AND a.%s NOT IN (%s)`, data_manage.BaseFromBusinessIndexCols.IndexCode, utils.GetOrmInReplace(codeLen))
 			pars = append(pars, req.IndexCodes)
 		}
 		// 查询max+1个指标

models/data_manage/base_from_business_index.go

@@ -197,6 +197,10 @@ func (m *BaseFromBusinessIndex) GetPageItemsByCondition(condition string, pars [
 // @return items []*BaseFromBusinessIndexItem
 // @return err error
 func (m *BaseFromBusinessIndex) GeItemsByCondition(condition string, pars []interface{}, limitSize int) (items []*BaseFromBusinessIndexItem, err error) {
+	if pars == nil {
+		pars = make([]interface{}, 0)
+	}
+
 	sql := `select a.*,b.edb_info_id,b.unique_code as edb_unique_code,b.classify_id as edb_classify_id FROM base_from_business_index AS a LEFT JOIN edb_info b on a.index_code=b.edb_code AND b.source=? WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -205,9 +209,11 @@ func (m *BaseFromBusinessIndex) GeItemsByCondition(condition string, pars []inte
 
 	if limitSize > 0 {
 		sql += " limit ? "
+		pars = append(pars, limitSize)
 	}
+
 	o := orm.NewOrmUsingDB("data")
-	_, err = o.Raw(sql, utils.DATA_SOURCE_BUSINESS, pars, limitSize).QueryRows(&items)
+	_, err = o.Raw(sql, utils.DATA_SOURCE_BUSINESS, pars).QueryRows(&items)
 
 	return
 }

services/data/edb_data.go

@@ -390,3 +390,64 @@ func GetEdbBeforeAndAfterDateData(targetDate string, dataList []*data_manage.Edb
 	}
 	return
 }
+
+//func GetPageData(edbInfoItem *data_manage.EdbInfoList) {
+//	var dataCondition string
+//	var dataPars []interface{}
+//
+//	dataCondition += ` AND edb_info_id=? `
+//	dataPars = append(dataPars, edbInfoItem.EdbInfoId)
+//
+//	if edbInfoItem.SubSource == utils.DATA_SUB_SOURCE_DATE {
+//		if edbInfoItem.Source == utils.DATA_SOURCE_WIND {
+//			dataCount, err := data_manage.GetEdbWsdDataCountByCondition(dataCondition, dataPars, edbInfoItem.Source)
+//			if err != nil && err.Error() != utils.ErrNoRow() {
+//				br.Msg = "获取指标信息失败"
+//				br.ErrMsg = "获取指标数据总数失败,Err:" + err.Error()
+//				return
+//			}
+//			page = paging.GetPaging(currentIndex, pageSize, dataCount)
+//			dataList, err := data_manage.GetEdbWsdDataListByCondition(dataCondition, dataPars, edbInfoItem.Source, pageSize, startSize)
+//			if err != nil {
+//				br.Msg = "获取指标信息失败"
+//				br.ErrMsg = "获取指标数据失败,Err:" + err.Error()
+//				return
+//			}
+//			edbInfoItem.DataList = dataList
+//		} else if edbInfoItem.Source == utils.DATA_SOURCE_THS {
+//			dataCount, err := data_manage.GetTHsDsDataCountByCondition(dataCondition, dataPars, edbInfoItem.Source)
+//			if err != nil && err.Error() != utils.ErrNoRow() {
+//				br.Msg = "获取指标信息失败"
+//				br.ErrMsg = "获取指标数据总数失败,Err:" + err.Error()
+//				return
+//			}
+//			page = paging.GetPaging(currentIndex, pageSize, dataCount)
+//			dataList, err := data_manage.GetThsDsDataListByCondition(dataCondition, dataPars, edbInfoItem.Source, pageSize, startSize)
+//			if err != nil {
+//				br.Msg = "获取指标信息失败"
+//				br.ErrMsg = "获取指标数据失败,Err:" + err.Error()
+//				return
+//			}
+//			edbInfoItem.DataList = dataList
+//		} else {
+//			br.Msg = "指标数据源id错误"
+//			br.ErrMsg = "指标数据源id错误"
+//			return
+//		}
+//	} else {
+//		dataCount, err := data_manage.GetEdbDataCountByCondition(dataCondition, dataPars, edbInfoItem.Source, edbInfoItem.SubSource)
+//		if err != nil && err.Error() != utils.ErrNoRow() {
+//			br.Msg = "获取指标信息失败"
+//			br.ErrMsg = "获取指标数据总数失败,Err:" + err.Error()
+//			return
+//		}
+//		page = paging.GetPaging(currentIndex, pageSize, dataCount)
+//		dataList, err := data_manage.GetEdbDataListByCondition(dataCondition, dataPars, edbInfoItem.Source, edbInfoItem.SubSource, pageSize, startSize)
+//		if err != nil {
+//			br.Msg = "获取指标信息失败"
+//			br.ErrMsg = "获取指标数据失败,Err:" + err.Error()
+//			return
+//		}
+//		edbInfoItem.DataList = dataList
+//	}
+//}