Browse Source

批量修改

kobe6258 2 months ago
parent
commit
0cdb8bf8bf
2 changed files with 8 additions and 2 deletions
  1. 2 1
      models/data_manage/base_from_oilchem.go
  2. 6 1
      models/data_manage/my_chart.go

+ 2 - 1
models/data_manage/base_from_oilchem.go

@@ -3,6 +3,7 @@ package data_manage
 import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
+	"github.com/shopspring/decimal"
 	"gorm.io/gorm"
 
 	"github.com/rdlucklib/rdluck_tools/paging"
@@ -48,7 +49,7 @@ type BaseFromOilchemData struct {
 	BaseFromOilchemIndexId int    // 指标ID
 	IndexCode              string // 指标编码
 	DataTime               string
-	Value                  string
+	Value                  decimal.Decimal
 	CreateTime             string
 	ModifyTime             string
 }

+ 6 - 1
models/data_manage/my_chart.go

@@ -1,6 +1,7 @@
 package data_manage
 
 import (
+	sql2 "database/sql"
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
 	"fmt"
@@ -131,8 +132,12 @@ func GetMyChartClassifyMastSort(adminId int) (sort int, err error) {
 // GetMyChartClassifyMinSort 获取MY ETA 分类中排序最小的值
 func GetMyChartClassifyMinSort(adminId int) (sort int, err error) {
 	o := global.DbMap[utils.DbNameIndex]
+	var scanSort sql2.NullInt64
 	sql := ` SELECT MIN(sort) sort FROM my_chart_classify WHERE admin_id=? `
-	err = o.Raw(sql, adminId).Scan(&sort).Error
+	err = o.Raw(sql, adminId).Scan(&scanSort).Error
+	if scanSort.Valid {
+		sort = int(scanSort.Int64)
+	}
 	return
 }