fix：代码运算，来源筛选框，增加选项并做一二级拆分

controllers/data_manage/edb_info.go

@@ -4345,3 +4345,75 @@ func (this *EdbInfoController) EdbSourceList() {
 	br.Success = true
 	br.Msg = "获取成功"
 }
+
+// EdbSourceListByPython
+// @Title 指标来源列表
+// @Description 指标来源列表
+// @Param   IsBase   query   int  false	"是否为基础指标: 1-是"
+// @Success 200 {object} data_manage.EdbInfoListResp
+// @router /edb_source/list/python [get]
+func (this *EdbInfoController) EdbSourceListByPython() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	isBase, _ := this.GetInt("IsBase", 0)
+
+	cond := ``
+	if isBase > 0 {
+		cond = ` AND is_base = 1`
+	}
+	pars := make([]interface{}, 0)
+	list, e := data_manage.GetEdbSourceItemsByCondition(cond, pars, []string{}, "")
+	if e != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取指标来源列表失败, Err: " + e.Error()
+		return
+	}
+
+	baseEdbList := make([]data_manage.EdbSourceChild, 0)
+	calEdbList := make([]data_manage.EdbSourceChild, 0)
+	for _, v := range list {
+		switch v.IsBase {
+		case 1:
+			baseEdbList = append(baseEdbList, data_manage.EdbSourceChild{
+				EdbSourceId: v.EdbSourceId,
+				SourceName:  v.SourceName,
+				IsBase:      v.IsBase,
+				TableName:   v.TableName,
+				Child:       []data_manage.EdbSourceChild{},
+			})
+		case 2:
+			calEdbList = append(calEdbList, data_manage.EdbSourceChild{
+				EdbSourceId: v.EdbSourceId,
+				SourceName:  v.SourceName,
+				IsBase:      v.IsBase,
+				TableName:   v.TableName,
+				Child:       []data_manage.EdbSourceChild{},
+			})
+		}
+	}
+	resp := []data_manage.EdbSourceChild{
+		{
+			EdbSourceId: 0,
+			SourceName:  "基础指标",
+			IsBase:      1,
+			Child:       baseEdbList,
+		},
+		{
+			EdbSourceId: 0,
+			SourceName:  "计算指标",
+			IsBase:      1,
+			Child:       calEdbList,
+		},
+	}
+
+	br.Data = resp
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+}

models/data_manage/edb_source.go

@@ -29,3 +29,12 @@ func GetEdbSourceItemsByCondition(condition string, pars []interface{}, fieldArr
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
+
+// EdbSourceChild 指标来源表
+type EdbSourceChild struct {
+	EdbSourceId int    `orm:"column(edb_source_id);pk"`
+	SourceName  string `description:"指标来源名称"`
+	TableName   string `description:"数据表名"`
+	IsBase      int    `description:"是否为基础指标: 2-否; 1-是"`
+	Child       []EdbSourceChild
+}

routers/commentsRouter.go

@@ -2185,6 +2185,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"],
+        beego.ControllerComments{
+            Method: "EdbSourceListByPython",
+            Router: `/edb_source/list/python`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"],
         beego.ControllerComments{
             Method: "EiaSteoClassify",