fix: 工具箱

models/cloud_disk_resource.go

@@ -4,6 +4,7 @@ import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
 	"fmt"
+	"gorm.io/gorm"
 	"strings"
 	"time"
 )
@@ -124,6 +125,11 @@ type CloudDiskListItem struct {
 	ButtonAuth  *CloudDiskListButton `description:"按钮权限" gorm:"-"`
 }
 
+func (m *CloudDiskListItem) AfterFind(db *gorm.DB) (err error) {
+	m.CreateTime = utils.GormDateStrToDateTimeStr(m.CreateTime)
+	return
+}
+
 // CloudDiskListButton 云盘列表按钮权限
 type CloudDiskListButton struct {
 	RenameAuth bool `description:"重命名文件夹的权限"`
@@ -153,6 +159,7 @@ func GetCloudDiskMenuAndResourceList(menuCond, resourceCond string, menuPars, re
 	sql := fmt.Sprintf(base, menuCond, resourceCond, order)
 	pars := make([]interface{}, 0)
 	pars = append(pars, menuPars, resourcePars)
+	sql = utils.ReplaceDriverKeywords("", sql)
 	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&items).Error
 	return
 }

models/data_manage/chart_classify.go

@@ -10,23 +10,21 @@ import (
 )
 
 type ChartClassify struct {
-	ChartClassifyId       int       `orm:"column(chart_classify_id);pk" gorm:"primaryKey" `
-	ChartClassifyName     string    `description:"分类名称"`
-	ParentId              int       `description:"父级id"`
-	HasData               int       `description:"是否含有指标数据"`
-	CreateTime            time.Time `description:"创建时间"`
-	ModifyTime            time.Time `description:"修改时间"`
-	SysUserId             int       `description:"创建人id"`
-	SysUserRealName       string    `description:"创建人姓名"`
-	Level                 int       `description:"层级"`
-	UniqueCode            string    `description:"唯一编码"`
-	Sort                  int       `description:"排序字段，越小越靠前，默认值：10"`
-	Source                int       `description:"1：ETA图库；2：商品价格曲线"`
-	IsJoinPermission      int       `description:"是否加入权限管控，0：不加入；1：加入；默认：0"`
-	ChartClassifyNameEn   string    `description:"英文分类名称"`
-	RootId                int       `description:"顶级ID"`
-	ChartClassifyNamePath string    `description:"分类名称的完整路径，格式为：父级分类名称|当前分类名称"`
-	ChartClassifyIdPath   string    `description:"分类的完整路径，格式为：父级ID,当前ID"`
+	ChartClassifyId     int       `orm:"column(chart_classify_id);pk" gorm:"primaryKey" `
+	ChartClassifyName   string    `description:"分类名称"`
+	ParentId            int       `description:"父级id"`
+	HasData             int       `description:"是否含有指标数据"`
+	CreateTime          time.Time `description:"创建时间"`
+	ModifyTime          time.Time `description:"修改时间"`
+	SysUserId           int       `description:"创建人id"`
+	SysUserRealName     string    `description:"创建人姓名"`
+	Level               int       `description:"层级"`
+	UniqueCode          string    `description:"唯一编码"`
+	Sort                int       `description:"排序字段，越小越靠前，默认值：10"`
+	Source              int       `description:"1：ETA图库；2：商品价格曲线"`
+	IsJoinPermission    int       `description:"是否加入权限管控，0：不加入；1：加入；默认：0"`
+	ChartClassifyNameEn string    `description:"英文分类名称"`
+	RootId              int       `description:"顶级ID"`
 }
 
 func AddChartClassify(item *ChartClassify) (lastId int64, err error) {

models/data_manage/chart_theme/chart_theme_default_data.go

@@ -58,7 +58,6 @@ func (m *ChartThemeDefaultData) Update(cols []string) (err error) {
 // @return err error
 func GetChartThemeDefaultDataItemList(endInfoId int, startDate string) (list []*data_manage.EdbDataList, err error) {
 	sql := `SELECT edb_data_id,edb_info_id,data_time,value,data_timestamp FROM chart_theme_default_data WHERE edb_info_id=? `
-	sql = utils.ReplaceDriverKeywords("", sql)
 	var pars []interface{}
 	if startDate != "" {
 		sql += ` AND data_time>=? `
@@ -67,7 +66,6 @@ func GetChartThemeDefaultDataItemList(endInfoId int, startDate string) (list []*
 
 	sql += ` ORDER BY data_time ASC `
 	sql = utils.ReplaceDriverKeywords("", sql)
-
 	err = global.DbMap[utils.DbNameIndex].Raw(sql, utils.ForwardPars(pars, endInfoId)...).Find(&list).Error
 	return
 }

models/data_manage/future_good/future_good_edb_info.go

@@ -4,6 +4,7 @@ import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
 	"github.com/beego/beego/v2/client/orm"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -32,11 +33,29 @@ type FutureGoodEdbInfo struct {
 	ModifyTime          time.Time
 }
 
+func (m *FutureGoodEdbInfo) AfterFind(db *gorm.DB) (err error) {
+	m.StartDate = utils.GormDateStrToDateStr(m.StartDate)
+	m.EndDate = utils.GormDateStrToDateStr(m.EndDate)
+	return
+}
+
+func (m *FutureGoodEdbInfo) ConvertTimeStr() {
+	m.StartDate = utils.GormDateStrToDateStr(m.StartDate)
+	m.EndDate = utils.GormDateStrToDateStr(m.EndDate)
+	return
+}
+
 // GetFutureGoodEdbInfo 期货指标
 func GetFutureGoodEdbInfo(edbInfoId int) (item *FutureGoodEdbInfo, err error) {
 	sql := `SELECT * FROM future_good_edb_info WHERE future_good_edb_info_id = ? `
 	sql += ` ORDER BY future_good_edb_info_id DESC `
 	err = global.DbMap[utils.DbNameIndex].Raw(sql, edbInfoId).First(&item).Error
+	if err != nil {
+		return
+	}
+	if item != nil {
+		item.ConvertTimeStr()
+	}
 	return
 }
 

utils/sql.go

@@ -107,6 +107,7 @@ func ReplaceDriverKeywords(driver string, sql string) string {
 			"value":    `"value"`,
 			"exchange": `"exchange"`,
 			"b.from":   `b."from"`,
+			"size":     `"size"`,
 		},
 	}
 	replacements, ok := rules[dbDriver]