Merge branch 'dm' of http://8.136.199.33:3000/eta_server/eta_api into dm

models/manual_edb.go

@@ -72,10 +72,10 @@ func GetEdbDataListByCode(tradeCode string) (items []*Edbdata, err error) {
 }
 
 type EdbInfoListItem struct {
-	TradeCode          string `orm:"column(TRADE_CODE);pk" description:"指标code"`
-	SecName            string `orm:"column(SEC_NAME);" description:"指标名称"`
-	Unit               string `orm:"column(UNIT);" description:"单位"`
-	Remark             string `orm:"column(REMARK);" description:"备注"`
+	TradeCode          string `gorm:"primaryKey;autoIncrement:false;column:TRADE_CODE" description:"指标code"`
+	SecName            string `gorm:"column:SEC_NAME;" description:"指标名称"`
+	Unit               string `gorm:"column:UNIT;" description:"单位"`
+	Remark             string `gorm:"column:REMARK;" description:"备注"`
 	Frequency          string `description:"频度"`
 	ClassifyId         int    `description:"分类id"`
 	ClassifyName       string `description:"分类名称"`
@@ -203,7 +203,7 @@ func DelEdbdataByCodeAndDateList(tradeCode string, dateList []string) (err error
 	}
 
 	o := global.DbMap[utils.DbNameManualIndex]
-	sql := `delete from edbdata  WHERE TRADE_CODE=? AND DT in (` + utils.GetOrmInReplace(num) + `) `
+	sql := `delete from edbdata  WHERE TRADE_CODE=? AND DT in (?) `
 	err = o.Exec(sql, tradeCode, dateList).Error
 	return
 }
@@ -255,14 +255,14 @@ func DelManualIndexByCodeList(codeList []string) (err error) {
 		}
 	}()
 	// 删除指标
-	sql := `DELETE FROM edbinfo WHERE TRADE_CODE  in (` + utils.GetOrmInReplace(num) + `) `
+	sql := `DELETE FROM edbinfo WHERE TRADE_CODE  in (?) `
 	err = to.Exec(sql, codeList).Error
 	if err != nil {
 		return
 	}
 
 	// 删除指标数据
-	sql = `DELETE FROM edbdata WHERE TRADE_CODE  in (` + utils.GetOrmInReplace(num) + `) `
+	sql = `DELETE FROM edbdata WHERE TRADE_CODE  in (?) `
 	err = to.Exec(sql, codeList).Error
 	if err != nil {
 		return
@@ -282,7 +282,7 @@ func GetEdbinfoListBySecNameList(secNameList []string) (items []*Edbinfo, err er
 	if num <= 0 {
 		return
 	}
-	sql := `SELECT * FROM edbinfo WHERE SEC_NAME in (` + utils.GetOrmInReplace(num) + ` ) AND REMARK='手动' `
+	sql := `SELECT * FROM edbinfo WHERE SEC_NAME in (?) AND REMARK='手动' `
 	o := global.DbMap[utils.DbNameManualIndex]
 	err = o.Raw(sql, secNameList).Find(&items).Error
 	return
@@ -309,12 +309,12 @@ func GetTargetsDataListByCodeList(tradeCodeList []string) (items []*Edbdata, err
 // EdbinfoOpRecord
 // @Description: 手工数据的操作日志
 type EdbinfoOpRecord struct {
-	EdbinfoOpRecordId int       `orm:"column(edbinfo_op_record_id);pk"`
-	TradeCode         string    `orm:"column(TRADE_CODE)" description:"指标编码"`
-	Remark            string    `orm:"column(remark)" description:"操作信息"`
-	UserId            int       `orm:"column(user_id)" description:"用户id"`
-	UserName          string    `orm:"column(user_name)" description:"用户姓名"`
-	CreateTime        time.Time `orm:"column(create_time)" description:"创建时间"`
+	EdbinfoOpRecordId int       `gorm:"column:edbinfo_op_record_id"`
+	TradeCode         string    `gorm:"column:TRADE_CODE" description:"指标编码"`
+	Remark            string    `gorm:"column:remark" description:"操作信息"`
+	UserId            int       `gorm:"column:user_id" description:"用户id"`
+	UserName          string    `gorm:"column:user_name" description:"用户姓名"`
+	CreateTime        time.Time `gorm:"column:create_time" description:"创建时间"`
 }
 
 // Remark备注：
@@ -351,11 +351,11 @@ func (m *EdbinfoOpRecord) MulCreate(list []*EdbinfoOpRecord) (err error) {
 // EdbinfoOpRecordItem
 // @Description: 手工数据的操作日志
 type EdbinfoOpRecordItem struct {
-	TradeCode  string `orm:"column(TRADE_CODE);pk" description:"指标编码"`
-	Remark     string `orm:"column(remark)" description:"操作信息"`
-	UserId     int    `orm:"column(user_id)" description:"用户id"`
-	UserName   string `orm:"column(user_name)" description:"用户姓名"`
-	CreateTime string `orm:"column(create_time)" description:"创建时间"`
+	TradeCode  string `gorm:"primaryKey;autoIncrement:false;column:TRADE_CODE" description:"指标编码"`
+	Remark     string `gorm:"column:remark" description:"操作信息"`
+	UserId     int    `gorm:"column:user_id" description:"用户id"`
+	UserName   string `gorm:"column:user_name" description:"用户姓名"`
+	CreateTime string `gorm:"column:create_time" description:"创建时间"`
 }
 
 // EdbinfoOpRecordListResp 指标数据结构体