From 546c5d5811ea1515fb0fedea551cf2f3bff24a27 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Sat, 12 Oct 2024 10:45:40 +0800 Subject: [PATCH] =?UTF-8?q?modify:=201.=20=E5=A2=9E=E5=8A=A0=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=85=81=E8=AE=B8=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E5=AD=97=E6=AE=B5;=202.=20=E4=BC=9A=E8=AE=AE?= =?UTF-8?q?=E8=AF=84=E5=AE=A1=E7=BB=93=E6=9E=9C=E4=B8=8A=E4=BC=A0=E5=8E=BB?= =?UTF-8?q?=E9=99=A4=E4=BC=9A=E8=AE=AE=E6=9C=AA=E7=BB=93=E6=9D=9F=E9=99=90?= =?UTF-8?q?=E5=88=B6=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/hz/pm/api/meeting/manage/MeetingManage.java | 4 ---- .../src/main/java/com/hz/pm/api/projectlib/mapper/ProjectMapper.xml | 3 ++- .../java/com/hz/pm/api/projectlib/model/dto/ProjectChangeListDTO.java | 3 +++ 3 files changed, 5 insertions(+), 5 deletions(-) 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; + }