diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/dto/MeetingReviewProjectDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/dto/MeetingReviewProjectDTO.java index d2fa0af..fd6d1dd 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/dto/MeetingReviewProjectDTO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/dto/MeetingReviewProjectDTO.java @@ -16,6 +16,9 @@ import java.math.BigDecimal; @Data public class MeetingReviewProjectDTO { + @ApiModelProperty("项目ID") + private Long projectId; + @ApiModelProperty("项目名称") private String projectName; 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 a3435b6..2c0b37c 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 @@ -418,6 +418,7 @@ public class MeetingManage { Map reviewMap = expertReviewService.listFinalReviewMap(meetingId); List convert = CollUtils.convert(projects, w -> { MeetingReviewProjectDTO mrp = new MeetingReviewProjectDTO(); + mrp.setProjectId(w.getId()); mrp.setBuildOrg(w.getBuildOrgName()); mrp.setProjectName(w.getProjectName()); mrp.setProjectType(w.getProjectType().toString()); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/mapper/MeetingExpertMapper.xml b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/mapper/MeetingExpertMapper.xml index 22eeada..73fd1d6 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/mapper/MeetingExpertMapper.xml +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/mapper/MeetingExpertMapper.xml @@ -74,11 +74,11 @@ - exists(select 1 from nd_expert_review ner where ner.project_id = np.id and ner.create_by = + exists(select 1 from nd_expert_review ner where ner.meeting_id = m.id and ner.project_id = np.id and ner.create_by = me.expert_id and is_final = true) - not exists(select 1 from nd_expert_review ner where ner.project_id = np.id and ner.create_by = + not exists(select 1 from nd_expert_review ner where ner.meeting_id = m.id and ner.project_id = np.id and ner.create_by = me.expert_id and is_final = true) @@ -97,7 +97,7 @@