。。

controllers/data_manage/usda_fas_data.go

@@ -428,8 +428,13 @@ func (this *EdbInfoController) UsdaFasBatchSearch() {
 		condition += " AND (index_name like ? OR index_code like ?) "
 		pars = utils.GetLikeKeywordPars(pars, keyword, 2)
 	}
-
-	if classifyIdStr == `` && keyword == `` {
+	frequencies := this.GetString("Frequencies")
+	if frequencies != "" {
+		frequencyList := strings.Split(frequencies, ",")
+		condition += " AND frequency IN (" + utils.GetOrmInReplace(len(frequencyList)) + " ) "
+		pars = append(pars, frequencyList)
+	}
+	if classifyIdStr == `` && keyword == `` && frequencies == `` {
 		var list = make([]*data_manage.BaseFromUsdaFasIndexList, 0)
 		br.Ret = 200
 		br.Success = true
@@ -458,7 +463,7 @@ func (this *EdbInfoController) UsdaFasBatchSearch() {
 // @Success 200 string "操作成功"
 // @router /usda_fas/batch_add [post]
 func (this *EdbInfoController) UsdaFasBatchAdd() {
-	/*br := new(models.BaseResponse).Init()
+	br := new(models.BaseResponse).Init()
 	defer func() {
 		if br.ErrMsg == "" {
 			br.IsSendEmail = false
@@ -592,7 +597,7 @@ func (this *EdbInfoController) UsdaFasBatchAdd() {
 	br.Msg = "操作成功"
 	br.Ret = 200
 	br.Success = true
-	br.IsAddLog = true*/
+	br.IsAddLog = true
 }
 
 // UsdaFasNameCheck
@@ -709,7 +714,7 @@ func (this *EdbInfoController) UsdaFasNameCheck() {
 // @Success 200 string "操作成功"
 // @router /usda_fas/edb_info/add_check [post]
 func (c *EdbInfoController) UsdaFasAddCheck() {
-	/*br := new(models.BaseResponse).Init()
+	br := new(models.BaseResponse).Init()
 	defer func() {
 		if br.ErrMsg == "" {
 			br.IsSendEmail = false
@@ -784,7 +789,7 @@ func (c *EdbInfoController) UsdaFasAddCheck() {
 	br.Data = resp
 	br.Msg = "校验成功"
 	br.Ret = 200
-	br.Success = true*/
+	br.Success = true
 }
 
 // UsdaFasEdbInfoAdd

models/data_manage/base_from_usda_fas_classify.go

@@ -76,6 +76,7 @@ type BaseFromUsdaFasClassifyItems struct {
 	BaseFromUsdaFasIndexId int    `description:"指标类型ID"`
 	IndexCode              string `description:"指标唯一编码"`
 	ClassifyName           string `description:"分类名称"`
+	ClassifyNameEn         string `description:"分类名称"`
 	UniqueCode             string `description:"分类唯一编码"`
 	ParentId               int    `description:"父级id"`
 	Level                  int    `description:"层级"`

services/data/base_from_usda_fas.go

@@ -0,0 +1,49 @@
+package data
+
+import (
+	"eta/eta_api/models/data_manage"
+	"eta/eta_api/utils"
+	"fmt"
+)
+
+// UsdaFasIndexSource2Edb 新增涌益咨询数据源到指标库
+func UsdaFasIndexSource2Edb(req data_manage.UsdaFasIndexSource2EdbReq, lang string) (edb *data_manage.EdbInfo, err error, errMsg string, skip bool) {
+	if req.EdbCode == "" {
+		err = fmt.Errorf("指标ID为空")
+		return
+	}
+	defer func() {
+		if err != nil {
+			tips := fmt.Sprintf("UsdaFasIndexSource2Edb新增失败, Err: %s", err.Error())
+			fmt.Println(tips)
+			utils.FileLog.Info(tips)
+		}
+	}()
+	source := utils.DATA_SOURCE_USDA_FAS
+
+	// 是否新增过指标
+	exist, e := data_manage.GetEdbInfoByEdbCode(source, req.EdbCode)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		err = fmt.Errorf("获取指标是否存在失败, err: %s", e.Error())
+		return
+	}
+	if exist != nil {
+		skip = true
+		return
+	}
+
+	// 开始结束时间
+	var startDate, endDate string
+
+	// 新增指标库
+	edbInfo, e, msg, _ := EdbInfoAdd(source, utils.DATA_SUB_SOURCE_EDB, req.ClassifyId, req.EdbCode, req.EdbName, req.Frequency, req.Unit, startDate, endDate, req.AdminId, req.AdminRealName, lang)
+	if e != nil {
+		errMsg = msg
+		err = fmt.Errorf("EdbInfo: 新增指标失败, err: %s", e.Error())
+		return
+	}
+
+	edb = edbInfo
+
+	return
+}