|
@@ -33,9 +33,10 @@ func AddOrUpdateEdbData(edbCode string, dataList []*models.EdbDataBase) (err err
|
|
|
err = fmt.Errorf("查询指标数据出错 error, %v", err)
|
|
|
return
|
|
|
}
|
|
|
- existMap := make(map[time.Time]*mgodb.EdbDataBase, len(existList))
|
|
|
+ existMap := make(map[string]*mgodb.EdbDataBase, len(existList))
|
|
|
for _, exist := range existList {
|
|
|
- existMap[exist.DataTime] = exist
|
|
|
+ tmp := exist.DataTime.In(time.Local).Format(utils.FormatDate)
|
|
|
+ existMap[tmp] = exist
|
|
|
}
|
|
|
for _, v := range dataList {
|
|
|
dataTime, e := time.ParseInLocation(utils.FormatDate, v.DataTime, time.Local)
|
|
@@ -48,7 +49,7 @@ func AddOrUpdateEdbData(edbCode string, dataList []*models.EdbDataBase) (err err
|
|
|
err = fmt.Errorf("指标数据格式化出错 error, %v", e)
|
|
|
return
|
|
|
}
|
|
|
- if oldObj, ok := existMap[dataTime]; !ok {
|
|
|
+ if oldObj, ok := existMap[v.DataTime]; !ok {
|
|
|
tmp := &mgodb.EdbDataBase{
|
|
|
EdbInfoId: 0,
|
|
|
EdbCode: v.EdbCode,
|
|
@@ -91,9 +92,10 @@ func AddOrUpdateEdbDataCalculate(edbCode string, dataList []*models.EdbDataBase)
|
|
|
err = fmt.Errorf("查询指标数据出错 error, %v", err)
|
|
|
return
|
|
|
}
|
|
|
- existMap := make(map[time.Time]*mgodb.EdbDataBase, len(existList))
|
|
|
+ existMap := make(map[string]*mgodb.EdbDataBase, len(existList))
|
|
|
for _, exist := range existList {
|
|
|
- existMap[exist.DataTime] = exist
|
|
|
+ tmp := exist.DataTime.In(time.Local).Format(utils.FormatDate)
|
|
|
+ existMap[tmp] = exist
|
|
|
}
|
|
|
for _, v := range dataList {
|
|
|
dataTime, e := time.ParseInLocation(utils.FormatDate, v.DataTime, time.Local)
|
|
@@ -106,7 +108,7 @@ func AddOrUpdateEdbDataCalculate(edbCode string, dataList []*models.EdbDataBase)
|
|
|
err = fmt.Errorf("指标数据格式化出错 error, %v", e)
|
|
|
return
|
|
|
}
|
|
|
- if oldObj, ok := existMap[dataTime]; !ok {
|
|
|
+ if oldObj, ok := existMap[v.DataTime]; !ok {
|
|
|
tmp := &mgodb.EdbDataBase{
|
|
|
EdbInfoId: 0,
|
|
|
EdbCode: v.EdbCode,
|