分类树查询修复

models/data_manage/base_from_oilchem.go

@@ -62,7 +62,7 @@ func (baseFromOilchemData *BaseFromOilchemData) AfterFind(db *gorm.DB) (err erro
 			baseFromOilchemData.CreateTime = utils.GormDateStrToDateTimeStr(baseFromOilchemData.CreateTime)
 		}
 		if baseFromOilchemData.DataTime != "" {
-			baseFromOilchemData.DataTime = utils.GormDateStrToDateTimeStr(baseFromOilchemData.DataTime)
+			baseFromOilchemData.DataTime = utils.GormDateStrToDateStr(baseFromOilchemData.DataTime)
 		}
 	}
 	return
@@ -263,7 +263,8 @@ func GetOilchemIndexByConditionAndFrequency(condition, frequency string, pars []
 	}
 	sql += ` AND frequency=?`
 	sql += ` ORDER BY sort ASC, base_from_oilchem_index_id ASC`
-	err = o.Raw(sql, pars, frequency).Find(&items).Error
+	pars = append(pars, frequency)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/target.go

@@ -290,14 +290,14 @@ func GetEdbinfoItemList(condition string, pars []interface{}, startSize, pageSiz
 
 // EdbParamsInfo 指标数据结构体
 type EdbParamsInfo struct {
-	Unit      string `orm:"column(UNIT);" description:"单位"`
+	Unit      string `orm:"column(UNIT);" description:"单位" gorm:"column:UNIT"`
 	Frequency string `orm:"column(frequency);" description:"单位"`
 }
 
 // GetEdbUnitList 获取指标单位
 func GetEdbUnitList() (items []*EdbParamsInfo, err error) {
 	o := global.DbMap[utils.DbNameManualIndex]
-	sql := `SELECT UNIT from edbinfo group by UNIT`
+	sql := `SELECT UNIT,Frequency from edbinfo group by UNIT`
 	err = o.Raw(sql).Find(&items).Error
 	return
 }

services/data/base_from_oilchem.go

@@ -37,7 +37,7 @@ func OilchemIndexSource2Edb(req OilchemIndexSource2EdbReq, lang string) (edb *da
 		err = fmt.Errorf("获取指标是否存在失败, err: %s", e.Error())
 		return
 	}
-	if exist != nil {
+	if exist != nil && exist.EdbInfoId > 0 {
 		skip = true
 		return
 	}