Merge branch 'eta/2.0.0' into debug

controllers/manual_edb.go

@@ -96,19 +96,6 @@ func (this *TargetController) EdbDetail() {
 		manualEdbInfo.DataList = dataList
 	}
 
-	// 查找是否加入到指标库
-	{
-		edbInfo, err := data_manage.GetEdbInfoByEdbCode(utils.DATA_SOURCE_MANUAL, manualEdbInfo.TradeCode)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取失败，Err:" + err.Error()
-			return
-		}
-		if edbInfo != nil {
-			manualEdbInfo.EdbExist = 1
-		}
-	}
-
 	resp := models.TargetDetailResp{
 		Detail:       manualEdbInfo,
 		ClassifyList: classifyList,

models/target.go

@@ -195,7 +195,7 @@ type Edbinfo struct {
 	Mobile       string `orm:"column(mobile)" description:"录入者手机号"`
 	Sort         int    `orm:"column(sort)" description:"排序"`
 	ModifyTime   string `description:"最近一次更新时间"`
-	IsJoinEdb  int8   `description:"指标库是否已添加：0-否；1-是"`
+	IsJoinEdb    int8   `description:"指标库是否已添加：0-否；1-是"`
 }
 
 func DeleteEdbinfoByTraceCodeList(tradeCodeList []string) (err error) {
@@ -1318,7 +1318,7 @@ type EdbInfoItem struct {
 	ModifyDate   string     `description:"待更新日期"`
 	ModifyTime   string     `description:"最近一次更新时间"`
 	Status       string     `description:"状态：未完成/完成"`
-	EdbExist     int        `description:"指标库是否已添加：0-否；1-是"`
+	Sort         int        `orm:"column(sort)" description:"排序"`
 	DataList     []*Edbdata `description:"指标数据列表"`
 }