Merge remote-tracking branch 'origin/master'

pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ExpertReviewController.java

@@ -48,17 +48,26 @@ public class ExpertReviewController {
         return expertReviewManage.getExpertReviewDetail(userId, projectId);
     }
 
-    @GetMapping("/listForGroupLeader/{projectId}/{meetingId}/{userId}")
+    @GetMapping("/listForGroupLeader/{projectId}/{meetingId}")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "userId", value = "专家ID"),
             @ApiImplicitParam(name = "projectId", value = "项目ID"),
             @ApiImplicitParam(name = "meetingId", value = "会议ID")
     })
     @ApiOperation("查看组员评审意见")
-    public List<ExpertReviewDetailVO> listForGroupLeader(@PathVariable Long userId,
-                                                         @PathVariable Long meetingId,
+    public List<ExpertReviewDetailVO> listForGroupLeader(@PathVariable Long meetingId,
                                                          @PathVariable Long projectId) {
-        return expertReviewManage.listForGroupLeader(projectId, meetingId, userId);
+        return expertReviewManage.listReviews(projectId, meetingId, true);
+    }
+
+    @GetMapping("/list/{projectId}/{meetingId}")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "projectId", value = "项目ID"),
+            @ApiImplicitParam(name = "meetingId", value = "会议ID")
+    })
+    @ApiOperation("查看项目某次会议的所有评审意见")
+    public List<ExpertReviewDetailVO> list(@PathVariable Long meetingId,
+                                           @PathVariable Long projectId) {
+        return expertReviewManage.listReviews(projectId, meetingId, false);
     }
 
 }

pmapi/src/main/java/com/ningdatech/pmapi/expert/manage/ExpertReviewManage.java

@@ -118,11 +118,11 @@ public class ExpertReviewManage {
         return buildExpertReviewDetail(reviews.get(0));
     }
 
-    public List<ExpertReviewDetailVO> listForGroupLeader(Long projectId, Long meetingId, Long userId) {
+    public List<ExpertReviewDetailVO> listReviews(Long projectId, Long meetingId, boolean onlyTeamMember) {
         LambdaQueryWrapper<ExpertReview> query = Wrappers.lambdaQuery(ExpertReview.class);
         query.eq(ExpertReview::getProjectId, projectId);
         query.eq(ExpertReview::getMeetingId, meetingId);
-        query.eq(ExpertReview::getIsFinal, Boolean.FALSE);
+        query.eq(onlyTeamMember, ExpertReview::getIsFinal, Boolean.FALSE);
         query.orderByDesc(ExpertReview::getCreateOn);
         List<ExpertReview> reviews = expertReviewService.list(query);
         if (reviews.isEmpty()) {