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

导出试验时，兼容历史数据格式不正确问题

Browse Source
This commit is contained in:
dengchun
2025-05-05 17:56:21 +08:00
parent df4f4a9cd5
commit e6b2d1cee2
1 changed files with 5 additions and 2 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/ExperimentController.java
View File

@@ -653,8 +653,11 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
RadiationProcessExportDTO detail = new RadiationProcessExportDTO();
List<ExperimentSampleInfo> sampleInfoList = radiationProcess.getSampleInfoList();
detail.setRadiateType(name);
detail.setSampleModel(sampleInfoList.stream().map(s -> s.getSampleModel()).collect(Collectors.joining(",")));
detail.setSampleType(sampleInfoList.stream().map(s -> s.getSampleType()).collect(Collectors.joining(",")));
if (CollUtil.isNotEmpty(sampleInfoList)) {
detail.setSampleModel(sampleInfoList.stream().map(s -> s.getSampleModel()).collect(Collectors.joining(",")));
detail.setSampleType(sampleInfoList.stream().map(s -> s.getSampleType()).collect(Collectors.joining(",")));
}
//detail.setMeasurementRate(radiationProcess.getMeasurementRate());
detail.setPlannedMeasurementRate(
xgy.stream().filter(v -> StringUtils.isNotBlank(v.getPlannedMeasurementRate())).map(v -> v.getPlannedMeasurementRate())