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-11-21 11:50:56 +08:00
parent 27a60eb5d3
commit 2717e319c4
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,7 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import java.util.Arrays; import java.util.Arrays;
import java.util.Optional;
/** /**
* @Description: 试验报告 * @Description: 试验报告
@@ -72,7 +73,7 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
IPage<ExperimentReport> pageList = experimentReportService.page(page, queryWrapper); IPage<ExperimentReport> pageList = experimentReportService.page(page, 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(experimentDoc.getFilePath()); v.setFileUrl(Optional.ofNullable(experimentDoc).map(ExperimentDoc::getFilePath).orElse(null));
}); });
return Result.OK(pageList); return Result.OK(pageList);
} }
@@ -177,7 +178,7 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
ExperimentDoc experimentDoc = experimentDocService.getByExperimentId(experimentReport.getExperimentId(), ExperimentDoc experimentDoc = experimentDocService.getByExperimentId(experimentReport.getExperimentId(),
ExperimentDocType.sybg.getType()); ExperimentDocType.sybg.getType());
experimentReport.setFileUrl(experimentDoc.getFilePath()); experimentReport.setFileUrl(Optional.ofNullable(experimentDoc).map(ExperimentDoc::getFilePath).orElse(null));
return Result.OK(experimentReport); return Result.OK(experimentReport);
} }
@@ -198,7 +199,7 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
} }
ExperimentDoc experimentDoc = experimentDocService.getByExperimentId(experimentId, ExperimentDocType.sybg.getType()); ExperimentDoc experimentDoc = experimentDocService.getByExperimentId(experimentId, ExperimentDocType.sybg.getType());
experimentReport.setFileUrl(experimentDoc.getFilePath()); experimentReport.setFileUrl(Optional.ofNullable(experimentDoc).map(ExperimentDoc::getFilePath).orElse(null));
return Result.OK(experimentReport); return Result.OK(experimentReport);
} }