zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/controller/admin/report/vo/base/ReportRespVO.java

@@ -1,7 +1,6 @@
 package com.zjugis.module.adm.controller.admin.report.vo.base;
 
 import com.zjugis.module.adm.controller.admin.report.vo.comment.ReportCommentRespVO;
-import com.zjugis.module.adm.controller.admin.report.vo.receive.ReportReceiveRespVO;
 import com.zjugis.module.adm.controller.admin.report.vo.workload.ReportWorkloadRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
@@ -20,6 +19,11 @@ public class ReportRespVO extends ReportBaseVO {
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime createTime;
 
+    /**
+     * 用户昵称
+     */
+    private String userNickname;
+
 
     @Schema(description = "工作量列表")
     private List<ReportWorkloadRespVO> workload;

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/report/ReportServiceImpl.java

@@ -236,11 +236,12 @@ public class ReportServiceImpl implements ReportService {
         List<ReportRespVO> reportList = reportPageResult.getList();
         List<Long> reportIds = reportList.stream().map(ReportRespVO::getId).collect(Collectors.toList());
         Set<String> userIdList = reportList.stream().map(ReportRespVO::getUserId).collect(Collectors.toSet());
-
+        Map<String, AdminUserRespDTO> userMap = adminUserApi.getAllUserMap();
         //工作量
         List<ReportWorkloadRespVO> workloadDetailList = reportWorkloadService.getReportWorkloadByRIds(reportIds, userIdList);
         reportList.forEach(report -> {
             report.setWorkload(workloadDetailList.stream().filter(load -> load.getReportId().equals(report.getId())).collect(Collectors.toList()));
+            report.setUserNickname(userMap.get(report.getUserId()).getNickname());
         });
         return reportPageResult;
     }