Merge remote-tracking branch 'origin/master'

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;
 

pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java

@@ -418,6 +418,7 @@ public class MeetingManage {
             Map<Long, ExpertReview> reviewMap = expertReviewService.listFinalReviewMap(meetingId);
             List<MeetingReviewProjectDTO> 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());

pmapi/src/main/java/com/ningdatech/pmapi/meeting/mapper/MeetingExpertMapper.xml

@@ -74,11 +74,11 @@
 
     <sql id="reviewedByHeadman">
         <if test="p.reviewed">
-            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)
         </if>
         <if test="!p.reviewed">
-            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)
         </if>
     </sql>
@@ -97,7 +97,7 @@
     <select id="pageReviewProjectList" resultType="com.ningdatech.pmapi.meeting.entity.dto.ReviewProjectDTO">
         select mip.project_id, np.project_name, np.project_type, np.project_year, np.build_org_name, m.type review_type,
         np.biz_domain, np.declare_amount declared_amount, mip.meeting_id, m.type meetingType, m.start_time reviewTime,
-        m.connecter, m.contact, me.is_headman, (select count(1) from nd_expert_review  ner where ner.project_id = np.id
+        m.connecter, m.contact, me.is_headman, (select count(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) reviewed
         from nd_project np inner join meeting_inner_project mip on mip.project_id = np.id
         inner join meeting m on m.id = mip.meeting_id