Browse Source

定时日报详情页标题异常修复

fuyuchuan 4 months ago
parent
commit
6414fccfb5

+ 7 - 2
service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/PmWorkReportServiceImpl.java

@@ -446,7 +446,7 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
                 pmReceive.setCreateTime(LocalDateTime.now());
                 for (SysUser user : users) {
                     if (user.getUserId().equals(id)) {
-                        pmReceive.setReceiverName(user.getUserName());
+                        pmReceive.setReceiverName(user.getNickName());
                         pmReceive.setDeptId(user.getDeptId());
                         pmReceive.setTenantId(user.getTenantId());
                     }
@@ -677,8 +677,13 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
         if (timedReports.isEmpty()) {
             return timedReports;
         }
+
         List<Integer> reportIds = timedReports.stream().map(PmWorkReport::getId).collect(Collectors.toList());
 
+        List<Long> userIds = timedReports.stream().map(PmWorkReport::getSubmitterId).collect(Collectors.toList());
+        List<SysUser> sysUsers = pmWorkContentService.nickNames(userIds);
+        Map<Long, String> userNicknameMap = sysUsers.stream().collect(Collectors.toMap(SysUser::getUserId, SysUser::getNickName));
+
         LambdaQueryWrapper<PmWorkContent> reportContents = Wrappers.lambdaQuery();
         reportContents.in(PmWorkContent::getReportId, reportIds);
         List<PmWorkContent> pmWorkContentList = pmWorkContentMapper.selectList(reportContents);
@@ -692,8 +697,8 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
                 }
             }
             report.setWorkContents(workContents);
+            report.setCreateBy(userNicknameMap.get(report.getSubmitterId()));
         }
-
         return timedReports;
     }