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 experimentId 必传,上传完成后自动保存到试验管理") + @Operation(summary = "试验管理-上传试验文件", description = + "fileType 选传, 值为 ['辐照试验委托书','试验大纲','沟通记录表','合同/委托书评审表','试验大纲评审表','试验流程检查单','辐照试验更改申请表','满意度调查表','其他文件'],不传默认 '其他文件'," + + "
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 result = new Result<>(); if (StringUtils.isBlank(fileType)) { fileType = ExperimentFileType.QTWJ.getType(); @@ -218,10 +217,12 @@ public class ExperimentFileController extends JeecgController fileList = experiment.getFileList(); + if (CollUtil.isNotEmpty(fileList)) { + for (ExperimentFile irradiationBoard : fileList) { + irradiationBoard.setExperimentId(experiment.getId()); + experimentFileService.saveOrUpdate(irradiationBoard); + } + } + } }