physical3/physical-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ls
2024-12-10 19:24:48 +08:00
parent 6a9547dbcd
commit 347363892f
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentFileController.java
View File

@@ -196,14 +196,13 @@ public class ExperimentFileController extends JeecgController<ExperimentFile, IE
return Result.OK(result); return Result.OK(result);
} }
@Operation(summary = "试验管理-上传试验文件", @Operation(summary = "试验管理-上传试验文件", description =
description = "fileType 选传, 值为 ['辐照试验委托书','试验大纲','沟通记录表','合同/委托书评审表','试验大纲评审表','试验流程检查单','辐照试验更改申请表','满意度调查表','其他文件'],不传默认 '其他文件',"
"fileType 选传, 值为 ['辐照试验委托书','试验大纲','沟通记录表','合同/委托书评审表','试验大纲评审表','试验流程检查单','辐照试验更改申请表','满意度调查表','其他文件'],不传默认 '其他文件'," + "</br> experimentId 选传,上传完成后自动保存到试验管理,不传则不保存")
+ "</br> experimentId 必传,上传完成后自动保存到试验管理")
@PostMapping(value = "/upload") @PostMapping(value = "/upload")
public Result<?> upload(HttpServletRequest request, HttpServletResponse response, public Result<?> upload(HttpServletRequest request, HttpServletResponse response,
@RequestParam(name = "experimentId", required = true) String experimentId, @RequestParam(name = "experimentId", required = false) String experimentId,
@RequestParam(name = "fileType", required = true) String fileType) throws Exception { @RequestParam(name = "fileType", required = false) String fileType) throws Exception {
Result<ExperimentFile> result = new Result<>(); Result<ExperimentFile> result = new Result<>();
if (StringUtils.isBlank(fileType)) { if (StringUtils.isBlank(fileType)) {
fileType = ExperimentFileType.QTWJ.getType(); fileType = ExperimentFileType.QTWJ.getType();
@@ -218,10 +217,12 @@ public class ExperimentFileController extends JeecgController<ExperimentFile, IE
ExperimentFile ossFile = new ExperimentFile(); ExperimentFile ossFile = new ExperimentFile();
ossFile.setFileName(file.getOriginalFilename()); ossFile.setFileName(file.getOriginalFilename());
ossFile.setExperimentId(experimentId);
ossFile.setFileUrl(savePath); ossFile.setFileUrl(savePath);
ossFile.setFileType(fileType); ossFile.setFileType(fileType);
experimentFileService.save(ossFile); if (StringUtils.isNotBlank(experimentId)) {
ossFile.setExperimentId(experimentId);
experimentFileService.save(ossFile);
}
result.setResult(ossFile); result.setResult(ossFile);
if (oConvertUtils.isNotEmpty(savePath)) { if (oConvertUtils.isNotEmpty(savePath)) {

8
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java
View File

@@ -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);
}
}
} }
} }