Browse Source

批量修改

kobe6258 3 weeks ago
parent
commit
c8b37e23ac
3 changed files with 12 additions and 6 deletions
  1. 2 0
      global/initDb.go
  2. 7 4
      models/data_manage/gl_data.go
  3. 3 2
      models/data_manage/smm_data.go

+ 2 - 0
global/initDb.go

@@ -18,8 +18,10 @@ import (
 )
 
 var (
+	//需要钩子函数执行的数据库表
 	tableMap = map[string]int{
 		"base_from_mysteel_chemical_data": 1,
+		"future_good_edb_info":            1,
 	}
 )
 

+ 7 - 4
models/data_manage/gl_data.go

@@ -25,7 +25,6 @@ type GlFrequency struct {
 	Frequency string `description:"频度:1-日度 2-周度 3-月度 4-季度 5-年度 99-无固定频率"`
 }
 
-
 func GetGlFrequencyByClassifyId(breedShortName string) (items []*GlFrequency, err error) {
 	o := global.DbMap[utils.DbNameGL]
 	var sql string
@@ -95,7 +94,7 @@ type GlIndexList struct {
 
 type GlIndexData struct {
 	InputValue string `description:"日期" gorm:"column:DATA_VALUE"`
-	DataTime  string `description:"值" gorm:"column:DATA_DATE"`
+	DataTime   string `description:"值" gorm:"column:DATA_DATE"`
 }
 
 func (g *GlIndexData) AfterFind(tx *gorm.DB) (err error) {
@@ -189,10 +188,14 @@ func GetGlDataMaxCount(classifyName string) (count int, err error) {
 }
 
 func GetGlDataByCode(indexCode string) (items []*GlIndexData, err error) {
+	//sql := `SELECT * FROM (
+	//	SELECT * FROM mb_index_main_data WHERE INDEX_CODE=?
+	//	GROUP BY UPDATE_TIME DESC, DATA_DATE DESC
+	//) a GROUP BY a.DATA_DATE DESC`
 	sql := `SELECT * FROM (
 		SELECT * FROM mb_index_main_data WHERE INDEX_CODE=? 
-		GROUP BY UPDATE_TIME DESC, DATA_DATE DESC
-	) a GROUP BY a.DATA_DATE DESC`
+		GROUP BY UPDATE_TIME , DATA_DATE  ORDER BY UPDATE_TIME DESC, DATA_DATE DESC
+	) a GROUP BY a.DATA_DATE ORDER BY a.DATA_DATE DESC`
 	o := global.DbMap[utils.DbNameGL]
 	err = o.Raw(sql, indexCode).Find(&items).Error
 	return

+ 3 - 2
models/data_manage/smm_data.go

@@ -4,6 +4,7 @@ import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
 	"github.com/rdlucklib/rdluck_tools/paging"
+	"github.com/shopspring/decimal"
 	"gorm.io/gorm"
 	"time"
 )
@@ -183,8 +184,8 @@ type SmmIndexList struct {
 }
 
 type SmmIndexData struct {
-	Value    string `gorm:"column:value" description:"日期"`
-	DataTime string `gorm:"column:data_time" description:"值"`
+	Value    decimal.Decimal `gorm:"column:value" description:"日期"`
+	DataTime string          `gorm:"column:data_time" description:"值"`
 }
 
 func (m *SmmIndexData) AfterFind(tx *gorm.DB) (err error) {