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

models/data_manage/base_from_hisugar.go

@@ -4,9 +4,10 @@ import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
 	"fmt"
+	"time"
+
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"gorm.io/gorm"
-	"time"
 )
 
 type BaseFromHisugarClassify struct {
@@ -32,6 +33,12 @@ type BaseFromHisugarIndex struct {
 	ModifyTime             string // 修改时间
 }
 
+func (b *BaseFromHisugarIndex) ConvertTimeStr() {
+	b.CreateTime = utils.GormDateStrToDateTimeStr(b.CreateTime)
+	b.ModifyTime = utils.GormDateStrToDateTimeStr(b.ModifyTime)
+	return
+}
+
 type BaseFromHisugarData struct {
 	BaseFromHisugarDataId  int    // 数据表ID
 	BaseFromHisugarIndexId int    // 指标ID
@@ -42,6 +49,13 @@ type BaseFromHisugarData struct {
 	ModifyTime             string
 }
 
+func (b *BaseFromHisugarData) AfterFind(db *gorm.DB) (err error) {
+	b.CreateTime = utils.GormDateStrToDateTimeStr(b.CreateTime)
+	b.ModifyTime = utils.GormDateStrToDateTimeStr(b.ModifyTime)
+	b.DataTime = utils.GormDateStrToDateStr(b.DataTime)
+	return
+}
+
 func GetHisugarClassifyList() (list []*BaseFromHisugarClassify, err error) {
 	o := global.DbMap[utils.DbNameIndex]
 	sql := "SELECT * FROM base_from_hisugar_classify ORDER BY sort ASC"
@@ -76,6 +90,10 @@ func GetHisugarIndexById(indexId int) (item *BaseFromHisugarIndex, err error) {
 	sql := ` SELECT * FROM base_from_hisugar_index WHERE 1=1 base_from_hisugar_index_id = ? `
 	sql += `ORDER BY base_from_hisugar_index_id ASC `
 	err = o.Raw(sql, indexId).First(&item).Error
+	if err != nil {
+		return
+	}
+	item.ConvertTimeStr()
 	return
 }
 func GetHisugarIndexByCode(indexCode string) (item *BaseFromHisugarIndexView, err error) {
@@ -86,6 +104,10 @@ LEFT JOIN edb_info AS e ON a.index_code=e.edb_code AND e.source=93
 	WHERE 1=1 and a.index_code = ? `
 	sql += `ORDER BY a.base_from_hisugar_index_id ASC `
 	err = o.Raw(sql, indexCode).First(&item).Error
+	if err != nil {
+		return
+	}
+	item.ConvertTimeStr()
 	return
 }
 
@@ -205,6 +227,22 @@ type BaseFromHisugarIndexView struct {
 	Value                  string `description:"值"`
 }
 
+func (b *BaseFromHisugarIndexView) AfterFind(db *gorm.DB) (err error) {
+	b.ModifyTime = utils.GormDateStrToDateTimeStr(b.ModifyTime)
+	b.DataTime = utils.GormDateStrToDateStr(b.DataTime)
+	b.StartDate = utils.GormDateStrToDateStr(b.StartDate)
+	b.EndDate = utils.GormDateStrToDateStr(b.EndDate)
+	return
+}
+
+func (b *BaseFromHisugarIndexView) ConvertTimeStr() {
+	b.ModifyTime = utils.GormDateStrToDateTimeStr(b.ModifyTime)
+	b.DataTime = utils.GormDateStrToDateStr(b.DataTime)
+	b.StartDate = utils.GormDateStrToDateStr(b.StartDate)
+	b.EndDate = utils.GormDateStrToDateStr(b.EndDate)
+	return
+}
+
 // ExportHisugarExcelReq 导出泛糖科技excel指标
 type ExportHisugarExcelReq struct {
 	KeyWord       string   `description:"关键字, 指标编码或指标ID"`

services/data/base_from_eia_steo.go

@@ -57,7 +57,7 @@ func EiaSteoIndexSource2Edb(req EiaSteoIndexSource2EdbReq, lang string) (edb *da
 		err = fmt.Errorf("获取指标是否存在失败, err: %s", e.Error())
 		return
 	}
-	if exist != nil {
+	if exist != nil && exist.EdbInfoId > 0 {
 		skip = true
 		return
 	}

services/data/base_from_fenwei_index_service.go

@@ -95,7 +95,7 @@ func FenWeiIndexAdd(req data_manage.FenWeiIndexAddReq, lang string) (edb *data_m
 		err = fmt.Errorf("获取指标是否存在失败, err: %s", e.Error())
 		return
 	}
-	if exist != nil {
+	if exist != nil && exist.EdbInfoId > 0 {
 		skip = true
 		return
 	}

services/data/base_from_gpr_risk.go

@@ -27,7 +27,7 @@ func GprRiskIndexSource2Edb(req data_manage.GprRiskIndexSource2EdbReq, lang stri
 		err = fmt.Errorf("获取指标是否存在失败, err: %s", e.Error())
 		return
 	}
-	if exist != nil {
+	if exist != nil && exist.EdbInfoId > 0 {
 		skip = true
 		return
 	}

services/data/base_from_hisugar.go

@@ -38,7 +38,7 @@ func HisugarIndexSource2Edb(req HisugarIndexSource2EdbReq, lang string) (edb *da
 		err = fmt.Errorf("获取指标是否存在失败, err: %s", e.Error())
 		return
 	}
-	if exist != nil {
+	if exist != nil && exist.EdbInfoId > 0 {
 		skip = true
 		return
 	}

services/data/base_from_ly_index_service.go

@@ -209,7 +209,7 @@ func LyIndexAdd(req LyIndexAddReq, lang string) (edb *data_manage.EdbInfo, err e
 		err = fmt.Errorf("获取指标是否存在失败, err: %s", e.Error())
 		return
 	}
-	if exist != nil {
+	if exist != nil && exist.EdbInfoId > 0 {
 		skip = true
 		return
 	}

services/data/base_from_rzd_index_service.go

@@ -78,7 +78,7 @@ func RzdIndexData(classifyId int, frequency string, currentIndex, startSize, pag
 		product.ModifyTime = v.ModifyTime
 
 		edbInfo := edbCodeMap[v.IndexCode]
-		if edbInfo != nil {
+		if edbInfo != nil && edbInfo.EdbInfoId > 0 {
 			product.EdbInfoId = edbInfo.EdbInfoId
 		}
 
@@ -260,7 +260,7 @@ func RzdIndexAdd(req data_manage.RzdIndexAddReq, lang string) (edb *data_manage.
 		err = fmt.Errorf("获取指标是否存在失败, err: %s", e.Error())
 		return
 	}
-	if exist != nil {
+	if exist != nil && exist.EdbInfoId > 0 {
 		skip = true
 		return
 	}

services/data/base_from_sci_hq.go

@@ -321,7 +321,7 @@ func SciHqIndexSource2Edb(req SciHqIndexSource2EdbReq, lang string) (edb *data_m
 		err = fmt.Errorf("获取指标是否存在失败, err: %s", e.Error())
 		return
 	}
-	if exist != nil {
+	if exist != nil && exist.EdbInfoId > 0 {
 		skip = true
 		return
 	}

services/data/base_from_usda_fas.go

@@ -27,7 +27,7 @@ func UsdaFasIndexSource2Edb(req data_manage.UsdaFasIndexSource2EdbReq, lang stri
 		err = fmt.Errorf("获取指标是否存在失败, err: %s", e.Error())
 		return
 	}
-	if exist != nil {
+	if exist != nil && exist.EdbInfoId > 0 {
 		skip = true
 		return
 	}

services/data/manual.go

@@ -184,7 +184,7 @@ func ManualIndexSource2Edb(req ManualIndexSource2EdbReq, lang string) (edb *data
 		err = fmt.Errorf("获取指标是否存在失败, err: %s", e.Error())
 		return
 	}
-	if exist != nil {
+	if exist != nil && exist.EdbInfoId > 0 {
 		skip = true
 		return
 	}

services/data/mysteel_chemical.go

@@ -412,7 +412,7 @@ func MysteelChemicalIndexSource2Edb(req MysteelChemicalIndexSource2EdbReq, lang
 		err = fmt.Errorf("获取指标是否存在失败, err: %s", e.Error())
 		return
 	}
-	if exist != nil {
+	if exist != nil && exist.EdbInfoId > 0 {
 		skip = true
 		return
 	}

services/data/yongyi.go

@@ -28,7 +28,7 @@ func YongyiIndexSource2Edb(req request.YongyiIndexSource2EdbReq, lang string) (e
 		err = fmt.Errorf("获取指标是否存在失败, err: %s", e.Error())
 		return
 	}
-	if exist != nil {
+	if exist != nil && exist.EdbInfoId > 0 {
 		skip = true
 		return
 	}