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
2025-06-14 20:59:55 +08:00
parent e7d2b26aa7
commit ef3f61376b
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,10 +83,10 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
} }
Page<ExperimentReport> page = new Page<>(pageNo, pageSize); Page<ExperimentReport> page = new Page<>(pageNo, pageSize);
IPage<ExperimentReport> pageList = experimentReportService.join(page, experimentReport, queryWrapper); IPage<ExperimentReport> pageList = experimentReportService.join(page, experimentReport, queryWrapper);
pageList.getRecords().forEach(v -> { //pageList.getRecords().forEach(v -> {
ExperimentDoc experimentDoc = experimentDocService.getByExperimentId(v.getExperimentId(), ExperimentDocType.sybg.getType()); // ExperimentDoc experimentDoc = experimentDocService.getByExperimentId(v.getExperimentId(), ExperimentDocType.sybg.getType());
v.setFileUrl(Optional.ofNullable(experimentDoc).map(ExperimentDoc::getFilePath).orElse(null)); // v.setFileUrl(Optional.ofNullable(experimentDoc).map(ExperimentDoc::getFilePath).orElse(null));
}); //});
return Result.OK(pageList); return Result.OK(pageList);
} }

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

@@ -212,7 +212,7 @@ public class ExperimentDocServiceImpl extends ServiceImpl<ExperimentDocMapper, E
return MinioUtil.upload(FileUtil.getInputStream(outputFile3), return MinioUtil.upload(FileUtil.getInputStream(outputFile3),
"experiment_doc/" + experimentId + "/" + version + "/" + experiment.getName() + "-" + type + ".docx"); "experiment_doc/" + experimentId + "/" + version + "/" + experiment.getName() + "-" + type + ".docx");
case "试验报告": case "试验报告":
List<ExperimentReport> reportList = experimentReportService.getPassedByExperimentId(experimentId); List<ExperimentReport> reportList = experimentReportService.getByExperimentId(experimentId);
List<String> pathList = new ArrayList<>(); List<String> pathList = new ArrayList<>();
String outputDir = tmpDirPath + type + File.separator + experimentId + File.separator + version; String outputDir = tmpDirPath + type + File.separator + experimentId + File.separator + version;
@@ -223,6 +223,9 @@ public class ExperimentDocServiceImpl extends ServiceImpl<ExperimentDocMapper, E
FileUtil.mkdir(outputDir); FileUtil.mkdir(outputDir);
} }
for (ExperimentReport experimentReport : reportList) { for (ExperimentReport experimentReport : reportList) {
if (StringUtils.isNotBlank(experimentReport.getFileUrl())) {
continue;
}
Map<String, Object> params = assembleSybg(experimentId, experimentReport); Map<String, Object> params = assembleSybg(experimentId, experimentReport);
XWPFTemplate render = XWPFTemplate.compile(absolutePath).render(params); XWPFTemplate render = XWPFTemplate.compile(absolutePath).render(params);
String filePath = outputDir + File.separator + experimentReport.getReportName() + ".docx"; String filePath = outputDir + File.separator + experimentReport.getReportName() + ".docx";