Browse Source

修正了时间格式名称错误

pull/150/head
allanwei 3 years ago
parent
commit
f76b26c6a3
1 changed files with 7 additions and 7 deletions
  1. +7
    -7
      services/report/implments/FilterDataInfo.service.impl.go

+ 7
- 7
services/report/implments/FilterDataInfo.service.impl.go View File

@ -544,8 +544,8 @@ func (impl *FilterDataInfoServiceImplement) GetDisplayData() (result []model.AWM
yesterdayLength += yesterdayModel.S3Len
}
}
yesterdayStartStr := yesterdayBegin.Add(time.Duration(yesterdayStart) * time.Second).Format(grmi.DatetimeOutFormat)
yesterdayEndStr := yesterdayBegin.Add(time.Duration(yesterdayEnd) * time.Second).Format(grmi.DatetimeOutFormat)
yesterdayStartStr := yesterdayBegin.Add(time.Duration(yesterdayStart) * time.Second).Format(grmi.DateTimeOutFormat)
yesterdayEndStr := yesterdayBegin.Add(time.Duration(yesterdayEnd) * time.Second).Format(grmi.DateTimeOutFormat)
// 求取今天的开始 结束时间
var startInt int
@ -589,12 +589,12 @@ func (impl *FilterDataInfoServiceImplement) GetDisplayData() (result []model.AWM
startDayModel := todayBegin.Add(time.Duration(startInt) * time.Second)
if endTime == "" {
endTime = time.Now().Format(grmi.DatetimeOutFormat)
endTime = time.Now().Format(grmi.DateTimeOutFormat)
endTime = endTime[11:len(endTime)]
}
if startTime != "" {
startTimeStr := todayString + " " + startTime
start, err = time.ParseInLocation(grmi.DatetimeOutFormat, startTimeStr, utils.TimezoneLocation)
start, err = time.ParseInLocation(grmi.DateTimeOutFormat, startTimeStr, utils.TimezoneLocation)
if err != nil {
return nil, err
}
@ -602,14 +602,14 @@ func (impl *FilterDataInfoServiceImplement) GetDisplayData() (result []model.AWM
start = startDayModel
}
endTimeStr := todayString + " " + endTime
end, err = time.ParseInLocation(grmi.DatetimeOutFormat, endTimeStr, utils.TimezoneLocation)
end, err = time.ParseInLocation(grmi.DateTimeOutFormat, endTimeStr, utils.TimezoneLocation)
if err != nil {
return nil, err
}
//dayModelList := impl.InitDayModelList(dayModel, today)
//duration := impl.GetValidDuration(dayModelList, start, end)
startStr := start.Format(grmi.DatetimeOutFormat)
endStr := end.Format(grmi.DatetimeOutFormat)
startStr := start.Format(grmi.DateTimeOutFormat)
endStr := end.Format(grmi.DateTimeOutFormat)
var displayData model.AWMDisplay
arcLi, err := dao.SelectDisplayData(descCN, startStr, endStr)
if err != nil {


Loading…
Cancel
Save