This commit is contained in:
ls
2025-05-03 16:49:25 +08:00
parent b68074bee5
commit d68f865f5b
2 changed files with 1 additions and 1 deletions

View File

@@ -253,7 +253,6 @@ public class ExperimentDocServiceImpl extends ServiceImpl<ExperimentDocMapper, E
root.put("辐射源", collect); root.put("辐射源", collect);
String temp = radiationProcessList.stream().map(v -> v.getEnvironmentalTemperature()).collect(Collectors.joining(",")); String temp = radiationProcessList.stream().map(v -> v.getEnvironmentalTemperature()).collect(Collectors.joining(","));
root.put("温度", temp); root.put("温度", temp);
root.put("湿度", "");
ExperimentReport latestReport = experimentReportService.getLatestReport(experimentId); ExperimentReport latestReport = experimentReportService.getLatestReport(experimentId);
root.put("批准人员姓名", Optional.ofNullable(latestReport).map(v -> sysUserService.getById(v.getConfirmer())) root.put("批准人员姓名", Optional.ofNullable(latestReport).map(v -> sysUserService.getById(v.getConfirmer()))
.map(SysUser::getRealname).orElse("")); .map(SysUser::getRealname).orElse(""));
@@ -269,6 +268,7 @@ public class ExperimentDocServiceImpl extends ServiceImpl<ExperimentDocMapper, E
sample.put("样品型号", sampleInfo.getSampleModel()); sample.put("样品型号", sampleInfo.getSampleModel());
sample.put("样品类型", sampleInfo.getSampleType()); sample.put("样品类型", sampleInfo.getSampleType());
sample.put("样品批次", sampleInfo.getSampleBatch()); sample.put("样品批次", sampleInfo.getSampleBatch());
sample.put("样品编号", sampleInfo.getModelBatch());
sample.put("注量率", ""); sample.put("注量率", "");
sample.put("总剂量", ""); sample.put("总剂量", "");
sampleList.add(sample); sampleList.add(sample);

Binary file not shown.