Merge branch 'bzq1/mysteel_chemical_custom' of eta_server/eta_api into debug

controllers/data_manage/mysteel_chemical_data.go

@@ -1550,12 +1550,6 @@ func (this *EdbInfoController) Add() {
 		return
 	}
 
-	source := req.Source
-	if source <= 0 {
-		br.Msg = "无效的数据来源"
-		return
-	}
-
 	req.EdbName = strings.Trim(req.EdbName, " ")
 	req.EdbCode = strings.Trim(req.EdbCode, " ")
 
@@ -1592,15 +1586,14 @@ func (this *EdbInfoController) Add() {
 			return
 		}
 	}
+	var source int
 	if tmpInfo != nil {
 		source = utils.DATA_SOURCE_MYSTEEL_CHEMICAL
-		req.Source = utils.DATA_SOURCE_MYSTEEL_CHEMICAL
-	}
-
-	if req.Source != utils.DATA_SOURCE_MYSTEEL_CHEMICAL {
-		br.Msg = "指标来源异常"
+	} else {
+		br.Msg = "指标不存在"
 		return
 	}
+
 	// 指标入库
 	edbInfo, err, errMsg, isSendEmail := data.EdbInfoAdd(source, utils.DATA_SUB_SOURCE_EDB, req.ClassifyId, req.EdbCode, req.EdbName, req.Frequency, req.Unit, req.StartDate, req.EndDate, sysUser.AdminId, sysUser.RealName, this.Lang)
 	if err != nil {

models/data_manage/mysteel_chemical_index.go

@@ -61,12 +61,8 @@ var BaseFromMysteelChemicalIndexCols = struct {
 	Unit                           string
 	Frequency                      string
 	Source                         string
-	SourceName                     string
 	StartDate                      string
 	EndDate                        string
-	Remark                         string
-	BaseModifyTime                 string
-	DataUpdateTime                 string
 	CreateTime                     string
 	ModifyTime                     string
 }{