From 347363892fadc08345b6d6e586090a1909a4f2d3 Mon Sep 17 00:00:00 2001
From: ls <lslvxy@163.com>
Date: Tue, 10 Dec 2024 19:24:48 +0800
Subject: [PATCH] update

---
 .../controller/ExperimentFileController.java    | 17 +++++++++--------
 .../service/impl/ExperimentServiceImpl.java     |  8 ++++++++
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentFileController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentFileController.java
index 63d2fc4..c22ff3b 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentFileController.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentFileController.java
@@ -196,14 +196,13 @@ public class ExperimentFileController extends JeecgController<ExperimentFile, IE
         return Result.OK(result);
     }
 
-    @Operation(summary = "试验管理-上传试验文件",
-            description =
-                    "fileType 选传, 值为 ['辐照试验委托书','试验大纲','沟通记录表','合同/委托书评审表','试验大纲评审表','试验流程检查单','辐照试验更改申请表','满意度调查表','其他文件'],不传默认 '其他文件',"
-                            + "</br> experimentId 必传,上传完成后自动保存到试验管理")
+    @Operation(summary = "试验管理-上传试验文件", description =
+            "fileType 选传, 值为 ['辐照试验委托书','试验大纲','沟通记录表','合同/委托书评审表','试验大纲评审表','试验流程检查单','辐照试验更改申请表','满意度调查表','其他文件'],不传默认 '其他文件',"
+                    + "</br> experimentId 选传,上传完成后自动保存到试验管理,不传则不保存")
     @PostMapping(value = "/upload")
     public Result<?> upload(HttpServletRequest request, HttpServletResponse response,
-                            @RequestParam(name = "experimentId", required = true) String experimentId,
-                            @RequestParam(name = "fileType", required = true) String fileType) throws Exception {
+                            @RequestParam(name = "experimentId", required = false) String experimentId,
+                            @RequestParam(name = "fileType", required = false) String fileType) throws Exception {
         Result<ExperimentFile> result = new Result<>();
         if (StringUtils.isBlank(fileType)) {
             fileType = ExperimentFileType.QTWJ.getType();
@@ -218,10 +217,12 @@ public class ExperimentFileController extends JeecgController<ExperimentFile, IE
 
         ExperimentFile ossFile = new ExperimentFile();
         ossFile.setFileName(file.getOriginalFilename());
-        ossFile.setExperimentId(experimentId);
         ossFile.setFileUrl(savePath);
         ossFile.setFileType(fileType);
-        experimentFileService.save(ossFile);
+        if (StringUtils.isNotBlank(experimentId)) {
+            ossFile.setExperimentId(experimentId);
+            experimentFileService.save(ossFile);
+        }
         result.setResult(ossFile);
 
         if (oConvertUtils.isNotEmpty(savePath)) {
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java
index e847860..e9fa348 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java
@@ -208,5 +208,13 @@ public class ExperimentServiceImpl extends ServiceImpl<ExperimentMapper, Experim
             }
         }
 
+        List<ExperimentFile> fileList = experiment.getFileList();
+        if (CollUtil.isNotEmpty(fileList)) {
+            for (ExperimentFile irradiationBoard : fileList) {
+                irradiationBoard.setExperimentId(experiment.getId());
+                experimentFileService.saveOrUpdate(irradiationBoard);
+            }
+        }
+
     }
 }