From ef3f61376be4f2c684627b593f892e98be4fb875 Mon Sep 17 00:00:00 2001
From: ls <lslvxy@163.com>
Date: Sat, 14 Jun 2025 20:59:55 +0800
Subject: [PATCH] update

---
 .../database/controller/ExperimentReportController.java   | 8 ++++----
 .../database/service/impl/ExperimentDocServiceImpl.java   | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java
index e165fd5..2dbe84d 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java
@@ -83,10 +83,10 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
         }
         Page<ExperimentReport> page = new Page<>(pageNo, pageSize);
         IPage<ExperimentReport> pageList = experimentReportService.join(page, experimentReport, queryWrapper);
-        pageList.getRecords().forEach(v -> {
-            ExperimentDoc experimentDoc = experimentDocService.getByExperimentId(v.getExperimentId(), ExperimentDocType.sybg.getType());
-            v.setFileUrl(Optional.ofNullable(experimentDoc).map(ExperimentDoc::getFilePath).orElse(null));
-        });
+        //pageList.getRecords().forEach(v -> {
+        //    ExperimentDoc experimentDoc = experimentDocService.getByExperimentId(v.getExperimentId(), ExperimentDocType.sybg.getType());
+        //    v.setFileUrl(Optional.ofNullable(experimentDoc).map(ExperimentDoc::getFilePath).orElse(null));
+        //});
         return Result.OK(pageList);
     }
 
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java
index 4662e3b..b48d06f 100755
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java
@@ -212,7 +212,7 @@ public class ExperimentDocServiceImpl extends ServiceImpl<ExperimentDocMapper, E
                 return MinioUtil.upload(FileUtil.getInputStream(outputFile3),
                         "experiment_doc/" + experimentId + "/" + version + "/" + experiment.getName() + "-" + type + ".docx");
             case "试验报告":
-                List<ExperimentReport> reportList = experimentReportService.getPassedByExperimentId(experimentId);
+                List<ExperimentReport> reportList = experimentReportService.getByExperimentId(experimentId);
                 List<String> pathList = new ArrayList<>();
 
                 String outputDir = tmpDirPath + type + File.separator + experimentId + File.separator + version;
@@ -223,6 +223,9 @@ public class ExperimentDocServiceImpl extends ServiceImpl<ExperimentDocMapper, E
                     FileUtil.mkdir(outputDir);
                 }
                 for (ExperimentReport experimentReport : reportList) {
+                    if (StringUtils.isNotBlank(experimentReport.getFileUrl())) {
+                        continue;
+                    }
                     Map<String, Object> params = assembleSybg(experimentId, experimentReport);
                     XWPFTemplate render = XWPFTemplate.compile(absolutePath).render(params);
                     String filePath = outputDir + File.separator + experimentReport.getReportName() + ".docx";