From 50fbb885f6c698375cce3838cfbc5a0449b0dc3a Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Thu, 13 Jul 2023 09:53:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8A=A5=E8=A1=A8=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kicc/report/endpoint/ReportEndpoint.java      |  3 +--
 .../kicc/report/provider/DatabaseProvider.java    | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/endpoint/ReportEndpoint.java b/kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/endpoint/ReportEndpoint.java
index 5f2de692..12158e60 100644
--- a/kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/endpoint/ReportEndpoint.java
+++ b/kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/endpoint/ReportEndpoint.java
@@ -8,7 +8,6 @@ import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.AppConstants;
 import com.cloud.kicc.report.api.entity.ReportSystemFile;
 import com.cloud.kicc.report.service.IReportFileService;
-import com.cloud.kicc.system.api.entity.Config;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
@@ -39,7 +38,7 @@ public class ReportEndpoint {
 
 	@GetMapping("/list")
 	public R list(Page page, ReportSystemFile reportFile) {
-		IPage<Config> configPage = service.page(page, getQueryWrapper(reportFile));
+		IPage<ReportSystemFile> configPage = service.page(page, getQueryWrapper(reportFile));
 		return R.ok(configPage.getRecords(), configPage.getTotal());
 	}
 
diff --git a/kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/provider/DatabaseProvider.java b/kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/provider/DatabaseProvider.java
index dc890d05..56c41c91 100644
--- a/kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/provider/DatabaseProvider.java
+++ b/kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/provider/DatabaseProvider.java
@@ -1,5 +1,6 @@
 package com.cloud.kicc.report.provider;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.bstek.ureport.provider.report.ReportFile;
 import com.bstek.ureport.provider.report.ReportProvider;
@@ -10,7 +11,7 @@ import lombok.AllArgsConstructor;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-import java.time.OffsetDateTime;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -45,10 +46,14 @@ public class DatabaseProvider implements ReportProvider {
 	public List<ReportFile> getReportFiles() {
 		List<ReportSystemFile> list = service.list();
 		List<ReportFile> reportFiles= new ArrayList<>();
-		list.forEach(reportSystemFile -> reportFiles.add(
-				new ReportFile(reportSystemFile.getName(),
-				Date.from(reportSystemFile.getUpdateTime().toInstant(OffsetDateTime.now().getOffset()))))
-		);
+		list.forEach(reportSystemFile -> {
+			Date toUpdateDate = Date.from((
+					ObjectUtil.isNotEmpty(reportSystemFile.getUpdateTime()) ?
+						reportSystemFile.getUpdateTime() :
+						reportSystemFile.getCreateTime()
+					).atZone(ZoneId.systemDefault()).toInstant());
+			reportFiles.add(new ReportFile(reportSystemFile.getName(), toUpdateDate));
+		});
 		return reportFiles;
 	}