浏览代码

钢联分类查询bug

xyxie 1 月之前
父节点
当前提交
8e29e5cb64
共有 2 个文件被更改,包括 8 次插入8 次删除
  1. 5 5
      models/data_manage/gl_data.go
  2. 3 3
      models/data_manage/mysteel_chemical_index.go

+ 5 - 5
models/data_manage/gl_data.go

@@ -73,11 +73,11 @@ func GetGlFrequency(productName string) (items []*string, err error) {
 
 type GlIndexList struct {
 	Id            int                `gorm:"column:ID;primaryKey"`
-	IndexCode     string             `description:"指标编码"`
-	IndexName     string             `description:"指标名称"`
-	UnitName      string             `description:"单位"`
-	FrequencyName string             `description:"频度名称"`
-	UpdateTime    string             `description:"更新时间"`
+	IndexCode     string             `gorm:"column:INDEX_CODE" description:"指标编码"`
+	INDEXNAME     string             `gorm:"column:INDEX_NAME" description:"指标名称"`
+	UNITNAME      string             `gorm:"column:UNIT_NAME" description:"单位"`
+	FREQUENCYNAME string             `gorm:"column:FREQUENCY_NAME" description:"频度名称"`
+	UPDATETIME    string             `gorm:"column:UPDATE_TIME" description:"更新时间"`
 	Paging        *paging.PagingItem `gorm:"-" description:"分页数据"`
 	DataList      []*GlIndexData     `gorm:"-"`
 }

+ 3 - 3
models/data_manage/mysteel_chemical_index.go

@@ -156,11 +156,11 @@ func GetMysteelChemicalIndexByClassifyId(classifyId int) (items []*BaseFromMyste
 func MysteelChemicalFrequencyByClassifyId(classifyId int) (items []*MysteelChemicalFrequency, err error) {
 	o := global.DbMap[utils.DbNameIndex]
 	if classifyId == 0 {
-		sql := ` SELECT frequency  FROM base_from_mysteel_chemical_index WHERE frequency != "" GROUP BY frequency ORDER BY frequency ASC `
+		sql := ` SELECT frequency  FROM base_from_mysteel_chemical_index WHERE frequency != '' GROUP BY frequency ORDER BY frequency ASC `
 		err = o.Raw(sql).Find(&items).Error
 		return
 	} else {
-		sql := ` SELECT frequency  FROM base_from_mysteel_chemical_index WHERE base_from_mysteel_chemical_classify_id = ? AND frequency != "" GROUP BY frequency ORDER BY frequency ASC `
+		sql := ` SELECT frequency  FROM base_from_mysteel_chemical_index WHERE base_from_mysteel_chemical_classify_id = ? AND frequency != '' GROUP BY frequency ORDER BY frequency ASC `
 		err = o.Raw(sql, classifyId).Find(&items).Error
 		return
 	}
@@ -169,7 +169,7 @@ func MysteelChemicalFrequencyByClassifyId(classifyId int) (items []*MysteelChemi
 // GetMysteelChemicalFrequency 获取钢联化工频度数据列表
 func GetMysteelChemicalFrequency(condition string, pars []interface{}) (items []*MysteelChemicalFrequency, err error) {
 	o := global.DbMap[utils.DbNameIndex]
-	sql := ` SELECT frequency FROM base_from_mysteel_chemical_index WHERE 1=1 AND frequency != "" `
+	sql := ` SELECT frequency FROM base_from_mysteel_chemical_index WHERE 1=1 AND frequency != '' `
 	if condition != "" {
 		sql += condition
 	}