diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java index 2ca078f..f2119f0 100755 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java @@ -82,7 +82,7 @@ public class ExperimentDocServiceImpl extends ServiceImpl().eq(Client::getName, experiment.getClientName()), false); root.put("委托方单位名称", Optional.ofNullable(client).map(Client::getName).orElse("")); - String startDate = formatDate(experiment.getStartDate()); - String endDate = formatDate(experiment.getEndDate()); + String startDate = formatDateTime(experiment.getStartDate()); + String endDate = formatDateTime(experiment.getEndDate()); root.put("试验时间", StringUtils.joinWith(" ~ ", startDate, endDate)); List radiationProcessList = experimentRadiationProcessService.getByExperimentId(experimentId); String collect = radiationProcessList.stream().map(v -> v.getRadiationSource()).collect(Collectors.joining(",")); @@ -278,10 +285,11 @@ public class ExperimentDocServiceImpl extends ServiceImpl v.getEnvironmentalTemperature()).collect(Collectors.joining(",")); root.put("温度", temp); ExperimentReport latestReport = experimentReportService.getLatestReport(experimentId); - root.put("批准人员姓名", Optional.ofNullable(latestReport).map(v -> sysUserService.getById(v.getConfirmer())) - .map(SysUser::getRealname).orElse("")); - root.put("编制人员姓名", Optional.ofNullable(sysUserService.getUserByName(experiment.getCreateBy())).map(SysUser::getRealname) - .orElse("")); + root.put("批准人员姓名", fixChineseName(Optional.ofNullable(latestReport).map(v -> sysUserService.getById(v.getConfirmer())) + .map(SysUser::getRealname).orElse(""))); + root.put("编制人员姓名", fixChineseName(Optional.ofNullable(sysUserService.getUserByName(experiment.getCreateBy())) + .map(SysUser::getRealname) + .orElse(""))); List> sampleList = new ArrayList<>(); for (ExperimentRadiationProcess radiationProcess : radiationProcessList) { @@ -328,12 +336,13 @@ public class ExperimentDocServiceImpl extends ServiceImpl params = new HashMap<>(); if (Objects.nonNull(experimentReport)) { - params.put("审核人员姓名", Optional.ofNullable(sysUserService.getById(experimentReport.getAuditor())).map(SysUser::getRealname) - .orElse("")); - params.put("校对人员姓名", Optional.ofNullable(sysUserService.getById(experimentReport.getProofreader())) - .map(SysUser::getRealname).orElse("")); - params.put("批准人员姓名", Optional.ofNullable(sysUserService.getById(experimentReport.getConfirmer())) - .map(SysUser::getRealname).orElse("")); + params.put("审核人员姓名", fixChineseName(Optional.ofNullable(sysUserService.getById(experimentReport.getAuditor())) + .map(SysUser::getRealname) + .orElse(""))); + params.put("校对人员姓名", fixChineseName(Optional.ofNullable(sysUserService.getById(experimentReport.getProofreader())) + .map(SysUser::getRealname).orElse(""))); + params.put("批准人员姓名", fixChineseName(Optional.ofNullable(sysUserService.getById(experimentReport.getConfirmer())) + .map(SysUser::getRealname).orElse(""))); params.put("报告生成日期", formatDate(experimentReport.getCreateTime())); params.put("批准日期", experimentReport.getConfirmerTime()); params.put("校对日期", experimentReport.getProofreaderTime()); @@ -342,8 +351,9 @@ public class ExperimentDocServiceImpl extends ServiceImpl().eq(Client::getName, experiment.getClientName()), false); params.put("委托方单位名称", Optional.ofNullable(client).map(Client::getName).orElse("")); params.put("委托方单位地址", Optional.ofNullable(client).map(Client::getAddress).orElse("")); @@ -391,11 +401,11 @@ public class ExperimentDocServiceImpl extends ServiceImpl v.getUserName()).collect(Collectors.joining(",")); params.put("操作员名称", operatorName); @@ -770,5 +780,24 @@ public class ExperimentDocServiceImpl extends ServiceImpl