工作量项目匹配修改

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/remote/dto/ProjectDto.java

@@ -3,6 +3,8 @@ package com.zjugis.module.adm.remote.dto;
 import com.zjugis.framework.common.pojo.PageParam;
 import lombok.Data;
 
+import java.util.Set;
+
 /**
  * @Author：zjq
  * @Date：2024-02-04
@@ -10,10 +12,8 @@ import lombok.Data;
 @Data
 public class ProjectDto extends PageParam {
 
-    /**
-     * 用户id
-     */
-    private String userId;
+
+    private Set<String> userList;
 
     /**
      * 项目名称

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

@@ -179,8 +179,9 @@ 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());
 
-        List<ReportWorkloadRespVO> workloadDetailList = reportWorkloadService.getReportWorkloadByRIds(reportIds);
+        List<ReportWorkloadRespVO> workloadDetailList = reportWorkloadService.getReportWorkloadByRIds(reportIds,userIdList);
 
         reportList.forEach(report -> {
             report.setWorkload(workloadDetailList.stream().filter(load -> load.getReportId().equals(report.getId())).collect(Collectors.toList()));
@@ -211,7 +212,8 @@ public class ReportServiceImpl implements ReportService {
             return reportList;
         }
         List<Long> reportIds = reportList.stream().map(ReportRespVO::getId).collect(Collectors.toList());
-        List<ReportWorkloadRespVO> workloadDetailList = reportWorkloadService.getReportWorkloadByRIds(reportIds);
+        Set<String> userIdList = reportList.stream().map(ReportRespVO::getUserId).collect(Collectors.toSet());
+        List<ReportWorkloadRespVO> workloadDetailList = reportWorkloadService.getReportWorkloadByRIds(reportIds,userIdList);
         List<ReportCommentRespVO> reportCommentList = reportCommentService.getReportCommentListByRIds(reportIds);
         List<ReportReceiveRespVO> reportReceiveList = reportReceiveService.getReportReceiveList(reportIds);
         List<AdminUserRespDTO> userInfoList = adminUserApi.getUsers(reportReceiveList.stream().map(ReportReceiveBaseVO::getReceiveUserId).distinct().collect(Collectors.toList())).getData();

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/reportworkload/ReportWorkloadService.java

@@ -27,7 +27,7 @@ public interface ReportWorkloadService {
      * @param reportId 报告ID
      * @return 工作量信息
      * **/
-    List<ReportWorkloadRespVO> getReportWorkloadByRIds(List<Long> reportId);
+    List<ReportWorkloadRespVO> getReportWorkloadByRIds(List<Long> reportId,Set<String> userIdList);
 
     /**
      * 创建行政管理_报告项目工作量

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/reportworkload/ReportWorkloadServiceImpl.java

@@ -65,7 +65,7 @@ public class ReportWorkloadServiceImpl implements ReportWorkloadService {
     }
 
     @Override
-    public List<ReportWorkloadRespVO> getReportWorkloadByRIds(List<Long> reportId) {
+    public List<ReportWorkloadRespVO> getReportWorkloadByRIds(List<Long> reportId,Set<String> userIdList) {
         if (CollectionUtils.isEmpty(reportId)) {
             return Collections.emptyList();
         }
@@ -74,7 +74,7 @@ public class ReportWorkloadServiceImpl implements ReportWorkloadService {
         ProjectDto projectDto = new ProjectDto();
         projectDto.setPageNo(1);
         projectDto.setPageSize(-1);
-        projectDto.setUserId(SecurityFrameworkUtils.getLoginUserId());
+        projectDto.setUserList(userIdList);
         CommonResult<Page<ProjectVO>> projectPage = businessClient.getProjectPage(projectDto);
         if (projectPage.isSuccess()) {
             List<ProjectVO> projectList = projectPage.getData().getRecords();