返回会议结束时间

pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/dto/ReviewProjectDTO.java

@@ -1,5 +1,7 @@
 package com.ningdatech.pmapi.meeting.entity.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ningdatech.pmapi.sms.constant.DatePattern;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -39,8 +41,13 @@ public class ReviewProjectDTO {
     private String buildOrgName;
 
     @ApiModelProperty("评审时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private LocalDateTime reviewTime;
 
+    @ApiModelProperty("评审结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    private LocalDateTime endReviewTime;
+
     @ApiModelProperty("评审类型")
     private Integer reviewType;
 

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

@@ -399,6 +399,7 @@ public class MeetingManage {
                 .meetingAddress(meeting.getMeetingAddress())
                 .typeName(getDictName(meeting.getType()))
                 .startTime(meeting.getStartTime())
+                .endTime(meeting.getEndTime())
                 .judgesAttendanceTime(meeting.getJudgesAttendanceTime())
                 .meetingUsageTime(meeting.getMeetingUsageTime())
                 .contact(meeting.getContact())

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

@@ -96,7 +96,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,
+        np.biz_domain, np.declare_amount declared_amount, mip.meeting_id, m.type meetingType, m.start_time reviewTime,m.end_time endReviewTime,
         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

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/ConstructionPlanController.java

@@ -2,19 +2,14 @@ package com.ningdatech.pmapi.projectdeclared.controller;
 
 import com.ningdatech.basic.model.PageVo;
 import com.ningdatech.pmapi.common.util.ExcelDownUtil;
+import com.ningdatech.pmapi.projectdeclared.manage.ConstructionPlanManage;
 import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO;
 import com.ningdatech.pmapi.projectdeclared.model.req.ConstrctionPlanListReq;
-import com.ningdatech.pmapi.projectdeclared.manage.ConstructionPlanManage;
-import com.ningdatech.pmapi.projectdeclared.model.req.PrequalificationDeclaredListReq;
-import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum;
-import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage;
-import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq;
 import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -51,7 +46,7 @@ public class ConstructionPlanController {
 
     @GetMapping("/export")
     @ApiOperation("可申报建设方案项目列表导出")
-    public void exportList(ConstrctionPlanListReq planReq, HttpServletResponse response){
-        ExcelDownUtil.downXls(response,planReq,constructionPlanManage::exportList);
+    public void exportList(ConstrctionPlanListReq planReq, HttpServletResponse response) {
+        ExcelDownUtil.downXls(response, planReq, constructionPlanManage::exportList);
     }
 }