toolchaintechnologycenter/spdm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:任务下编辑报告归档

Browse Source
This commit is contained in:
zhuxinru
2026-02-10 15:46:49 +08:00
parent 738751dcef
commit e34482000a
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/main/java/com/sdm/common/entity/resp/project/SpdmTaskVo.java
View File

@@ -228,7 +228,7 @@ public class SpdmTaskVo extends BaseEntity {
@Schema(description= "报告模板内容")
private String reportContent;
@Schema(description= "任务uuid")
private String taskId;
@Schema(description= "报告模板uuid")
private String reportTemplate;
}

12
project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java
View File

@@ -1527,7 +1527,7 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
MockMultipartFile multipartFile = new MockMultipartFile(
reportName,
reportName,
"application/json",
"application/octet-stream",
fileData);
resultReq.setFile(multipartFile);
resultReq.setFileName(reportName);
@@ -1727,7 +1727,7 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
MockMultipartFile multipartFile = new MockMultipartFile(
reportName,
reportName,
"application/json",
"application/octet-stream",
fileData);
if (StringUtils.isNotEmpty(req.getTaskId())) {
// 上传到任务下的交付物文件夹的报告文件夹下
@@ -1738,6 +1738,9 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
filesReq.setFileType(FileBizTypeEnum.REPORT_FILE.getValue());
filesReq.setUuid(null);
filesReq.setDirId(parentId);
filesReq.setFileTypeDictClass(FileDictTagEnum.FILE_TYPE.getDictClass());
filesReq.setFileTypeDictValue(String.valueOf(FileBizTypeEnum.REPORT_FILE.getValue()));
filesReq.setDictTags(Arrays.asList(FileDictTagEnum.FILE_TYPE.getDictClassFieldName(), FileDictTagEnum.FILE_TYPE.getDictValueFieldName()));
SdmResponse sdmResponse = uploadKeyResultFiles(filesReq);
if (!sdmResponse.isSuccess()) {
throw new RuntimeException("生成自动化报告上传任务报告结果目录失败");
@@ -1875,7 +1878,7 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
MockMultipartFile multipartFile = new MockMultipartFile(
reportName,
reportName,
"application/json",
"application/octet-stream",
fileData);
if (StringUtils.isNotEmpty(req.getTaskId())) {
// 上传到任务下的交付物文件夹的报告文件夹下
@@ -1886,6 +1889,9 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
filesReq.setFileType(FileBizTypeEnum.REPORT_FILE.getValue());
filesReq.setUuid(null);
filesReq.setDirId(parentId);
filesReq.setFileTypeDictClass(FileDictTagEnum.FILE_TYPE.getDictClass());
filesReq.setFileTypeDictValue(String.valueOf(FileBizTypeEnum.REPORT_FILE.getValue()));
filesReq.setDictTags(Arrays.asList(FileDictTagEnum.FILE_TYPE.getDictClassFieldName(), FileDictTagEnum.FILE_TYPE.getDictValueFieldName()));
SdmResponse sdmResponse = uploadKeyResultFiles(filesReq);
if (!sdmResponse.isSuccess()) {
throw new RuntimeException("生成自动化报告上传任务报告结果目录失败");