diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/IExpertReviewService.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/IExpertReviewService.java index fe05a21..91074c2 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/IExpertReviewService.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/IExpertReviewService.java @@ -40,10 +40,18 @@ public interface IExpertReviewService extends IService { * 获取最终评审结果 * * @param meetingId 会议ID - * @param projectId 项目ID * @return {@link ExpertReview} * @author WendyYang **/ - Map listFinalReview(Long meetingId); + Map listFinalReviewMap(Long meetingId); + + /** + * 获取最终评审结果 + * + * @param meetingId 会议ID + * @return {@link ExpertReview} + * @author WendyYang + **/ + List listFinalReview(Long meetingId); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/impl/ExpertReviewServiceImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/impl/ExpertReviewServiceImpl.java index c0accdd..e07a0e3 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/impl/ExpertReviewServiceImpl.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/impl/ExpertReviewServiceImpl.java @@ -44,11 +44,16 @@ public class ExpertReviewServiceImpl extends ServiceImpl listFinalReview(Long meetingId) { + public Map listFinalReviewMap(Long meetingId) { + return CollUtils.listToMap(listFinalReview(meetingId), ExpertReview::getProjectId); + } + + @Override + public List listFinalReview(Long meetingId) { LambdaQueryWrapper query = Wrappers.lambdaQuery(ExpertReview.class); query.eq(ExpertReview::getMeetingId, meetingId); query.eq(ExpertReview::getIsFinal, Boolean.TRUE); - return CollUtils.listToMap(list(query), ExpertReview::getProjectId); + return list(query); } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java index 3ab6456..f0f0cd8 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java @@ -763,7 +763,7 @@ public class MeetingManage { List projects = meetingInnerProjectService.listByMeetingId(meetingId); List projectIdList = CollUtils.fieldList(projects, MeetingInnerProject::getProjectId); List projectList = projectService.listByIds(projectIdList); - Map reviewMap = expertReviewService.listFinalReview(meetingId); + Map reviewMap = expertReviewService.listFinalReviewMap(meetingId); return CollUtils.convert(projectList, w -> { MeetingReviewProjectVO vo = buildProjectList(w); ExpertReview review = reviewMap.get(w.getId());