From 78406594651c7e8a16ff219141a0471331d5ef98 Mon Sep 17 00:00:00 2001
From: buaixuexideshitongxue <2936013465@qq.com>
Date: Mon, 21 Sep 2026 18:23:53 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E6=9D=90=E6=96=99=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E8=A6=81=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervision/controller/FileController.java      |  8 +++++++-
 .../java/com/biutag/supervision/pojo/vo/FileVo.java | 10 ++++++++++
 .../service/Report/ReportProjectService.java        | 13 +++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/biutag/supervision/controller/FileController.java b/src/main/java/com/biutag/supervision/controller/FileController.java
index 89de957..648b5ab 100644
--- a/src/main/java/com/biutag/supervision/controller/FileController.java
+++ b/src/main/java/com/biutag/supervision/controller/FileController.java
@@ -3,10 +3,12 @@ package com.biutag.supervision.controller;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.StrUtil;
+import com.biutag.supervision.common.UserContextHolder;
 import com.biutag.supervision.mapper.FileBase64Mapper;
 import com.biutag.supervision.pojo.Result;
 import com.biutag.supervision.pojo.dto.FileBase64Dto;
 import com.biutag.supervision.pojo.entity.FileBase64;
+import com.biutag.supervision.pojo.model.UserAuth;
 import com.biutag.supervision.pojo.vo.FileVo;
 import com.biutag.supervision.service.FileService;
 import com.biutag.supervision.util.ImgUtils;
@@ -22,6 +24,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.time.LocalDateTime;
 import java.util.Base64;
 import java.util.Objects;
 import java.util.Optional;
@@ -41,9 +44,12 @@ public class FileController {
     public Result<FileVo> upload(@RequestPart("file") MultipartFile file) throws IOException {
         log.info("文件上传 upload------------------------------");
         String filePath = fileService.upload(file);
+        UserAuth user = UserContextHolder.getCurrentUser();
         return Result.success(new FileVo()
                 .setFileName(file.getOriginalFilename())
-                .setFilePath(filePath));
+                .setFilePath(filePath)
+                .setUploadUser(user.getNickName())
+                .setUploadTime(LocalDateTime.now()));
     }
 
     @ResponseBody
diff --git a/src/main/java/com/biutag/supervision/pojo/vo/FileVo.java b/src/main/java/com/biutag/supervision/pojo/vo/FileVo.java
index d5b0b58..571aaf6 100644
--- a/src/main/java/com/biutag/supervision/pojo/vo/FileVo.java
+++ b/src/main/java/com/biutag/supervision/pojo/vo/FileVo.java
@@ -1,8 +1,12 @@
 package com.biutag.supervision.pojo.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
 
 @Accessors(chain = true)
 @Setter
@@ -21,4 +25,10 @@ public class FileVo {
 
     private String base64;
 
+    private String uploadUser;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime uploadTime;
+
 }
diff --git a/src/main/java/com/biutag/supervision/service/Report/ReportProjectService.java b/src/main/java/com/biutag/supervision/service/Report/ReportProjectService.java
index 3b299da..173cd01 100644
--- a/src/main/java/com/biutag/supervision/service/Report/ReportProjectService.java
+++ b/src/main/java/com/biutag/supervision/service/Report/ReportProjectService.java
@@ -51,6 +51,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -264,6 +265,18 @@ public class ReportProjectService extends ServiceImpl<ReportProjectMapper, Repor
                     s.setReportId(queryParam.getProject().getId());
                     BeanUtil.copyProperties(s, file);
                     file.setFiles(JSONObject.toJSONString(s.getFileData()));
+                    if (CollectionUtil.isEmpty(s.getFileData())) {
+                        file.setCrtUser(null);
+                        file.setCrtTime(null);
+                    } else {
+                        s.getFileData().stream()
+                                .filter(fileVo -> fileVo.getUploadTime() != null)
+                                .max(Comparator.comparing(FileVo::getUploadTime))
+                                .ifPresent(latestFile -> {
+                                    file.setCrtUser(latestFile.getUploadUser());
+                                    file.setCrtTime(latestFile.getUploadTime());
+                                });
+                    }
                     files.add(file);
                 });
                 fileService.saveBatch(files);