..

models/mgodb/edb_data_base.go

@@ -27,34 +27,6 @@ type EdbInfoSearchData struct {
 	EdbCode  string    `description:"指标编码" bson:"edb_code"`
 }
 
-func GetEdbDataBaseByEdbInfoId(edbInfoId int) (items []*EdbDataBase, err error) {
-	findOptions := options.Find()
-	db := NewMgo(utils.MgoDataDbName, "edb_data_base", utils.MgoDataCli)
-	filter := bson.D{{"edb_info_id", edbInfoId}}
-	ctx := context.TODO()
-	cur, err := db.Find(filter, findOptions)
-	if err != nil {
-		return
-	}
-	// Close the cursor once finished
-	defer cur.Close(ctx)
-	for cur.Next(ctx) {
-		// create a value into which the single document can be decoded
-		var elem EdbDataBase
-		err = cur.Decode(&elem)
-		if err != nil {
-			return
-		}
-
-		items = append(items, &elem)
-	}
-
-	if err = cur.Err(); err != nil {
-		return
-	}
-	return
-}
-
 func GetEdbDataBaseByEdbCode(edbCode string) (items []*EdbDataBase, err error) {
 	findOptions := options.Find()
 	db := NewMgo(utils.MgoDataDbName, "edb_data_base", utils.MgoDataCli)
@@ -73,7 +45,9 @@ func GetEdbDataBaseByEdbCode(edbCode string) (items []*EdbDataBase, err error) {
 		if err != nil {
 			return
 		}
-
+		elem.DataTime = elem.DataTime.In(time.Local)
+		elem.CreateTime = elem.CreateTime.In(time.Local)
+		elem.ModifyTime = elem.ModifyTime.In(time.Local)
 		items = append(items, &elem)
 	}
 

models/mgodb/edb_data_calculate.go

@@ -9,34 +9,6 @@ import (
 	"time"
 )
 
-func GetEdbDataCalculateByEdbInfoId(edbInfoId int) (items []*EdbDataBase, err error) {
-	findOptions := options.Find()
-	db := NewMgo(utils.MgoDataDbName, "edb_data_calculate", utils.MgoDataCli)
-	filter := bson.D{{"edb_info_id", edbInfoId}}
-	ctx := context.TODO()
-	cur, err := db.Find(filter, findOptions)
-	if err != nil {
-		return
-	}
-	// Close the cursor once finished
-	defer cur.Close(ctx)
-	for cur.Next(ctx) {
-		// create a value into which the single document can be decoded
-		var elem EdbDataBase
-		err = cur.Decode(&elem)
-		if err != nil {
-			return
-		}
-
-		items = append(items, &elem)
-	}
-
-	if err = cur.Err(); err != nil {
-		return
-	}
-	return
-}
-
 func GetEdbDataCalculateByEdbCode(edbCode string) (items []*EdbDataBase, err error) {
 	findOptions := options.Find()
 	db := NewMgo(utils.MgoDataDbName, "edb_data_calculate", utils.MgoDataCli)
@@ -55,7 +27,9 @@ func GetEdbDataCalculateByEdbCode(edbCode string) (items []*EdbDataBase, err err
 		if err != nil {
 			return
 		}
-
+		elem.DataTime = elem.DataTime.In(time.Local)
+		elem.CreateTime = elem.CreateTime.In(time.Local)
+		elem.ModifyTime = elem.ModifyTime.In(time.Local)
 		items = append(items, &elem)
 	}
 

services/edb_data.go

@@ -36,7 +36,7 @@ func AddOrUpdateEdbData(edbCode string, dataList []*models.EdbDataBase) (err err
 	existMap := make(map[string]*mgodb.EdbDataBase, len(existList))
 	deleteMap := make(map[string]struct{}, len(existList))
 	for _, exist := range existList {
-		tmp := exist.DataTime.In(time.Local).Format(utils.FormatDate)
+		tmp := exist.DataTime.Format(utils.FormatDate)
 		existMap[tmp] = exist
 		deleteMap[tmp] = struct{}{}
 	}
@@ -121,7 +121,7 @@ func AddOrUpdateEdbDataCalculate(edbCode string, dataList []*models.EdbDataBase)
 	existMap := make(map[string]*mgodb.EdbDataBase, len(existList))
 	deleteMap := make(map[string]struct{}, len(existList))
 	for _, exist := range existList {
-		tmp := exist.DataTime.In(time.Local).Format(utils.FormatDate)
+		tmp := exist.DataTime.Format(utils.FormatDate)
 		existMap[tmp] = exist
 		deleteMap[tmp] = struct{}{}
 	}