批量修改

controllers/data_manage/yongyi_data.go

@@ -343,7 +343,7 @@ func (this *EdbInfoController) YongyiSingleData() {
 	ret.Unit = indexInfo.Unit
 	for _, v := range dataTmpList {
 		tmp := &data_manage.YongyiSingleData{
-			Value:    v.Value,
+			Value:    v.Value.String(),
 			DataTime: v.DataTime,
 		}
 		dataList = append(dataList, tmp)

models/data_manage/base_from_yongyi.go

@@ -3,6 +3,7 @@ package data_manage
 import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
+	"github.com/shopspring/decimal"
 	"gorm.io/gorm"
 	"time"
 
@@ -160,7 +161,7 @@ type BaseFromYongyiData struct {
 	YongyiIndexId int
 	IndexCode     string
 	DataTime      string
-	Value         string
+	Value         decimal.Decimal
 	CreateTime    string
 	ModifyTime    string
 	DataTimestamp int64 `gorm:"column:data_timestamp"`

services/data/edb_classify.go

@@ -1114,7 +1114,7 @@ func MoveEdbClassify(req data_manage.MoveEdbClassifyReq, sysUser *system.Admin,
 			err = fmt.Errorf("获取父级分类下的同名分类失败, Err: %s", e.Error())
 			return
 		}
-		if exists != nil {
+		if exists != nil && exists.ClassifyId>0{
 			errMsg = "移动失败，分类名称已存在"
 			return
 		}

utils/sql.go

@@ -316,7 +316,7 @@ func NeedDateOrTimeFormat(driver string) bool {
 	} else {
 		dbDriver, _ = getDriverInstance(driver)
 	}
-	if dbDriver == DM {
+	if dbDriver == DM || dbDriver == MySql{
 		return true
 	}
 	return false