|
|
@@ -164,7 +164,7 @@ type OilchemDataBatchAddCheckReq struct {
|
|
|
// GetOilchemIndexAndEdbInfoByCondition 根据条件获取隆众资讯index和指标库的信息
|
|
|
func GetOilchemIndexAndEdbInfoByCondition(condition string, pars []interface{}) (items []*BaseFromOilchemIndexView, err error) {
|
|
|
o := orm.NewOrmUsingDB("data")
|
|
|
- sql := ` SELECT b.*, e.edb_info_id FROM base_from_oilchem_index AS b LEFT JOIN edb_info AS e ON b.index_code=e.edb_code AND e.source=? WHERE 1=1 `
|
|
|
+ sql := ` SELECT b.*, e.edb_info_id, e.unique_code, e.classify_id AS edb_classify_id FROM base_from_oilchem_index AS b LEFT JOIN edb_info AS e ON b.index_code=e.edb_code AND e.source=? WHERE 1=1 `
|
|
|
|
|
|
if condition != "" {
|
|
|
sql += condition
|
|
|
@@ -187,6 +187,7 @@ type BaseFromOilchemIndexView struct {
|
|
|
EndDate string `description:"结束日期"`
|
|
|
Sort int `description:"排序"`
|
|
|
EdbExist int `description:"edb是否存在"`
|
|
|
+ EdbClassifyId int `description:"edb分类id"`
|
|
|
ModifyTime string
|
|
|
}
|
|
|
|
zwxi