diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/manage/MeetingManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/manage/MeetingManage.java index 581ef97..869e5c0 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/manage/MeetingManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/manage/MeetingManage.java @@ -1113,10 +1113,6 @@ public class MeetingManage { if (meeting == null || MeetingStatusEnum.CANCEL.eq(meeting.getStatus())) { throw ReturnException.wrap("会议不存在或已取消"); } - LocalDateTime now = LocalDateTime.now(); - if (meeting.getEndTime().isAfter(now)) { - throw ReturnException.wrap("会议未结束"); - } if (!Boolean.TRUE.equals(meeting.getIsInnerProject())) { throw ReturnException.wrap("此会议未关联项目"); } diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/mapper/ProjectMapper.xml b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/mapper/ProjectMapper.xml index 49644e5..9da37d5 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/mapper/ProjectMapper.xml +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/mapper/ProjectMapper.xml @@ -500,7 +500,8 @@ npch.status as changeStatus, npch.create_on as change_apply_time, npch.id as changeId, - npch.inst_code as instCode + npch.inst_code as instCode, + npch.can_resubmit as canResubmit from (select * from nd_project ${ew.customSqlSegment}) np inner join nd_project_change_history npch on np.id = npch.project_id diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/dto/ProjectChangeListDTO.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/dto/ProjectChangeListDTO.java index b88e665..a8f6d83 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/dto/ProjectChangeListDTO.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/dto/ProjectChangeListDTO.java @@ -59,4 +59,7 @@ public class ProjectChangeListDTO { @ApiModelProperty("变更ID") private Long changeId; + @ApiModelProperty("是否可重新提交") + private Boolean canResubmit; + }