批量修改

models/data_manage/base_from_business_index.go

@@ -5,6 +5,7 @@ import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
 	"github.com/rdlucklib/rdluck_tools/paging"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -172,6 +173,29 @@ type BaseFromBusinessIndexItem struct {
 	EdbExist                int    `description:"指标库是否已添加：0-否；1-是"`
 }
 
+func (obj *BaseFromBusinessIndexItem) AfterFind(tx *gorm.DB) (err error) {
+	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {
+		if obj.CreateTime != "" {
+			obj.CreateTime = utils.GormDateStrToDateTimeStr(obj.CreateTime)
+		}
+		if obj.ModifyTime != "" {
+			obj.ModifyTime = utils.GormDateStrToDateTimeStr(obj.ModifyTime)
+		}
+		if obj.DataUpdateTime != "" {
+			obj.DataUpdateTime = utils.GormDateStrToDateTimeStr(obj.DataUpdateTime)
+		}
+		if obj.BaseModifyTime != "" {
+			obj.BaseModifyTime = utils.GormDateStrToDateTimeStr(obj.BaseModifyTime)
+		}
+		if obj.StartDate != "" {
+			obj.StartDate = utils.GormDateStrToDateStr(obj.StartDate)
+		}
+		if obj.EndDate != "" {
+			obj.EndDate = utils.GormDateStrToDateStr(obj.EndDate)
+		}
+	}
+	return
+}
 func (m *BaseFromBusinessIndex) GetPageItemsByCondition(condition string, pars []interface{}, orderRule string, startSize, pageSize int) (items []*BaseFromBusinessIndexItem, err error) {
 	sql := `select a.*,b.edb_info_id,b.unique_code as edb_unique_code,b.classify_id as edb_classify_id FROM base_from_business_index AS a LEFT JOIN edb_info b on a.index_code=b.edb_code AND b.source=? WHERE 1=1 `
 	if condition != "" {
@@ -183,7 +207,9 @@ func (m *BaseFromBusinessIndex) GetPageItemsByCondition(condition string, pars [
 		sql += ` order by ` + orderRule
 	}
 	sql += ` limit ?,? `
-	err = global.DbMap[utils.DbNameIndex].Raw(sql, utils.DATA_SOURCE_BUSINESS, pars, startSize, pageSize).Find(&items).Error
+	pars = utils.ForwardPars(pars, utils.DATA_SOURCE_BUSINESS)
+	pars = append(pars, startSize, pageSize)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, pars...).Find(&items).Error
 
 	return
 }

models/data_manage/base_from_sci_hq_data.go

@@ -3,6 +3,7 @@ package data_manage
 import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -17,6 +18,15 @@ type BaseFromSciHqData struct {
 	DataTimestamp        int64     `description:"数据时间戳"`
 }
 
+func (obj *BaseFromSciHqData) AfterFind(tx *gorm.DB) (err error) {
+	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {
+		if obj.DataTime != "" {
+			obj.DataTime = utils.GormDateStrToDateStr(obj.DataTime)
+		}
+	}
+	return
+}
+
 // GetSciHqDataByIndexId 根据指标id获取指标数据
 func GetSciHqDataByIndexId(indexId int) (items []*BaseFromSciHqData, err error) {
 	o := global.DbMap[utils.DbNameIndex]

models/data_manage/base_from_sci_hq_index.go

@@ -90,7 +90,8 @@ func GetSciHqIndexByConditionAndFrequency(condition, frequency string, pars []in
 	}
 	sql += ` AND frequency=?`
 	sql += ` ORDER BY sort ASC, base_from_sci_hq_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/data_manage/base_from_usda_fas.go

@@ -3,6 +3,7 @@ package data_manage
 import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
+	"gorm.io/gorm"
 	"time"
 
 	"github.com/rdlucklib/rdluck_tools/paging"
@@ -44,6 +45,26 @@ type BaseFromUsdaFasIndexList struct {
 	DataList               []*BaseFromUsdaFasData `gorm:"-"`
 	Paging                 *paging.PagingItem     `description:"分页数据" gorm:"-"`
 }
+
+func (obj *BaseFromUsdaFasIndexList) AfterFind(db *gorm.DB) (err error) {
+	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {
+		if obj.CreateTime != "" {
+			obj.CreateTime = utils.GormDateStrToDateTimeStr(obj.CreateTime)
+		}
+		if obj.ModifyTime != "" {
+			obj.ModifyTime = utils.GormDateStrToDateTimeStr(obj.ModifyTime)
+		}
+		if obj.StartDate != "" {
+			obj.StartDate = utils.GormDateStrToDateStr(obj.StartDate)
+		}
+
+		if obj.EndDate != "" {
+			obj.EndDate = utils.GormDateStrToDateStr(obj.EndDate)
+		}
+	}
+	return
+}
+
 type BaseFromUsdaFasIndexSearchList struct {
 	List   []*BaseFromUsdaFasIndexList
 	Paging *paging.PagingItem `description:"分页数据"`
@@ -126,6 +147,11 @@ func GetUsdaFasIndexDataTimePageByCodes(indexCodes []string, startSize, pageSize
 	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT data_time FROM base_from_usda_fas_data WHERE index_code in (` + utils.GetOrmInReplace(len(indexCodes)) + `) GROUP BY data_time ORDER BY data_time DESC LIMIT ?,? `
 	err = o.Raw(sql, indexCodes, startSize, pageSize).Scan(&dataTimes).Error
+	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {
+		for i := range dataTimes {
+			dataTimes[i] = utils.GormDateStrToDateStr(dataTimes[i])
+		}
+	}
 	return
 }
 
@@ -201,6 +227,21 @@ type BaseFromUsdaFasData struct {
 	DataTimestamp          int64
 }
 
+func (obj *BaseFromUsdaFasData) AfterFind(tx *gorm.DB) (err error) {
+	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {
+		if obj.CreateTime != "" {
+			obj.CreateTime = utils.GormDateStrToDateTimeStr(obj.CreateTime)
+		}
+		if obj.ModifyTime != "" {
+			obj.ModifyTime = utils.GormDateStrToDateTimeStr(obj.ModifyTime)
+		}
+		if obj.DataTime != "" {
+			obj.DataTime = utils.GormDateStrToDateStr(obj.DataTime)
+		}
+	}
+	return
+}
+
 type BaseFromUsdaFasIndexSearchItem struct {
 	BaseFromUsdaFasIndexId int `orm:"column(base_from_usda_fas_index_id);pk" gorm:"primaryKey"`
 	ClassifyId             int

models/data_manage/base_from_usda_fas_classify.go

@@ -71,15 +71,15 @@ func UpdateBaseFromUsdaFasClassifySort(classifyId int) (err error) {
 }
 
 type BaseFromUsdaFasClassifyItems struct {
-	ClassifyId             int    `description:"分类ID"`
-	BaseFromUsdaFasIndexId int    `description:"指标类型ID"`
-	IndexCode              string `description:"指标唯一编码"`
-	ClassifyName           string `description:"分类名称"`
-	ClassifyNameEn         string `description:"分类名称"`
-	UniqueCode             string `description:"分类唯一编码"`
-	ParentId               int    `description:"父级id"`
-	Level                  int    `description:"层级"`
-	Sort                   int    `description:"排序字段，越小越靠前，默认值：10"`
+	ClassifyId             int                             `description:"分类ID"`
+	BaseFromUsdaFasIndexId int                             `description:"指标类型ID"`
+	IndexCode              string                          `description:"指标唯一编码"`
+	ClassifyName           string                          `description:"分类名称"`
+	ClassifyNameEn         string                          `description:"分类名称"`
+	UniqueCode             string                          `description:"分类唯一编码"`
+	ParentId               int                             `description:"父级id"`
+	Level                  int                             `description:"层级"`
+	Sort                   int                             `description:"排序字段，越小越靠前，默认值：10"`
 	Children               []*BaseFromUsdaFasClassifyItems `description:"子级" gorm:"-"`
 }
 

services/data/base_from_ccf.go

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