diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ExpertReviewController.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ExpertReviewController.java index 19af5fd..552b50a 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ExpertReviewController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ExpertReviewController.java @@ -48,14 +48,17 @@ public class ExpertReviewController { return expertReviewManage.getExpertReviewDetail(userId, projectId); } - @GetMapping("/listForGroupLeader/{projectId}/{userId}") + @GetMapping("/listForGroupLeader/{projectId}/{meetingId}/{userId}") @ApiImplicitParams({ @ApiImplicitParam(name = "userId", value = "专家ID"), - @ApiImplicitParam(name = "projectId", value = "项目ID") + @ApiImplicitParam(name = "projectId", value = "项目ID"), + @ApiImplicitParam(name = "meetingId", value = "会议ID") }) @ApiOperation("查看组员评审意见") - public List listForGroupLeader(@PathVariable Long userId, @PathVariable Long projectId) { - return expertReviewManage.listForGroupLeader(projectId, userId); + public List listForGroupLeader(@PathVariable Long userId, + @PathVariable Long meetingId, + @PathVariable Long projectId) { + return expertReviewManage.listForGroupLeader(projectId, meetingId, userId); } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/manage/ExpertReviewManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/manage/ExpertReviewManage.java index 8acd3ac..4d977dc 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/manage/ExpertReviewManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/manage/ExpertReviewManage.java @@ -98,10 +98,11 @@ public class ExpertReviewManage { return buildExpertReviewDetail(reviews.get(0)); } - public List listForGroupLeader(Long projectId, Long userId) { + public List listForGroupLeader(Long projectId, Long meetingId, Long userId) { LambdaQueryWrapper query = Wrappers.lambdaQuery(ExpertReview.class); query.eq(ExpertReview::getProjectId, projectId); - query.ne(ExpertReview::getCreateBy, userId); + query.eq(ExpertReview::getMeetingId, meetingId); + query.eq(ExpertReview::getIsFinal, Boolean.FALSE); query.orderByDesc(ExpertReview::getCreateOn); List reviews = expertReviewService.list(query); return CollUtils.convert(reviews, this::buildExpertReviewDetail);