Merge branch 'dm' of http://8.136.199.33:3000/eta_server/eta_api into dm

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)

controllers/data_source/data_source.go

@@ -260,6 +260,19 @@ func (c *DataSourceController) SearchByEs() {
 	//	}
 	//}
 
+	for _, v := range listMap {
+		classifyId, ok := v[classifyIdKey].(int)
+		if !ok {
+			v["ClassifyUniqueCode"] = ""
+			continue
+		}
+		v["ClassifyUniqueCode"] = strconv.Itoa(classifyId)
+		startDate := v["StartDate"].(string)
+		v["StartDate"] = utils.GormDateStrToDateStr(startDate)
+		endDate := v["EndDate"].(string)
+		v["EndDate"] = utils.GormDateStrToDateStr(endDate)
+	}
+
 	page := paging.GetPaging(currentIndex, pageSize, total)
 	resp := dataSourceModel.SearchDataSourceResp{
 		Paging: page,

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"`

models/data_manage/lz_data.go

@@ -62,6 +62,13 @@ type LongzhongSurveyProduct struct {
 	LzCode               string    `gorm:"column:lz_code"`
 }
 
+func (m *LongzhongSurveyProduct) AfterFind(db *gorm.DB) (err error) {
+	m.StartDate = utils.GormDateStrToDateStr(m.StartDate)
+	m.EndDate = utils.GormDateStrToDateStr(m.StartDate)
+
+	return
+}
+
 func GetLongzhongSurveyProduct(breedId, frequency int) (items []*LongzhongSurveyProduct, err error) {
 	sql := `SELECT * FROM longzhong_survey_product WHERE breed_id=? AND frequency=? ORDER BY survey_product_id ASC`
 	o := global.DbMap[utils.DbNameManualIndex]

models/data_source/data_source.go

@@ -2016,7 +2016,7 @@ type BaseFromMtjhIndex struct {
 	BaseFromMtjhIndexId int       `gorm:"column:base_from_mtjh_index_id;primaryKey"`
 	IndexCode           string    `description:"指标编码"`
 	IndexName           string    `description:"指标名称"`
-	DealValue           float64   `description:"成交量"`
+	DealValue           string    `description:"成交量"`
 	DataTime            time.Time `description:"数据日期"`
 	Unit                string    `description:"单位"`
 	Frequency           string    `description:"频度"`

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