Browse Source

Merge pull request '下载结果文件的结束时间修改。' (#881) from zouap_static into V20211115

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/881
Reviewed-by: ychao_1983 <ychao_1983@sina.com>
pull/888/head
ychao_1983 3 years ago
parent
commit
8f2a3a85a6
1 changed files with 8 additions and 0 deletions
  1. +8
    -0
      routers/repo/user_data_analysis.go

+ 8
- 0
routers/repo/user_data_analysis.go View File

@@ -53,6 +53,7 @@ func QueryUserStaticDataPage(ctx *context.Context) {
settingStartTime, _ := time.Parse("2006-01-02", setting.RadarMap.RecordBeginTime)
if startTime.Unix() < settingStartTime.Unix() {
startTime = settingStartTime
startDate = settingStartTime.Format("2006-01-02")
}
endTime, _ = time.Parse("2006-01-02", endDate)
endTime = endTime.AddDate(0, 0, 1)
@@ -135,6 +136,13 @@ func QueryUserStaticDataPage(ctx *context.Context) {
//设置默认打开的表单
xlsx.SetActiveSheet(index)
var filename string

nowTime := time.Now()
nowZeroTime := time.Date(nowTime.Year(), nowTime.Month(), nowTime.Day(), 0, 0, 0, 0, nowTime.Location())
if endTime.Unix() >= nowZeroTime.Unix() {
endDate = nowZeroTime.AddDate(0, 0, -1).Format("2006-01-02")
}

if isAll {
filename = sheetName + "_" + ctx.Tr("user.static.all") + ".xlsx"
} else {


Loading…
Cancel
Save