Browse Source

modify:

1. 增加是否允许重新提交变更字段;
2. 会议评审结果上传去除会议未结束限制;
tags/24101101^0
WendyYang 2 months ago
parent
commit
546c5d5811
3 changed files with 5 additions and 5 deletions
  1. +0
    -4
      hz-pm-api/src/main/java/com/hz/pm/api/meeting/manage/MeetingManage.java
  2. +2
    -1
      hz-pm-api/src/main/java/com/hz/pm/api/projectlib/mapper/ProjectMapper.xml
  3. +3
    -0
      hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/dto/ProjectChangeListDTO.java

+ 0
- 4
hz-pm-api/src/main/java/com/hz/pm/api/meeting/manage/MeetingManage.java View File

@@ -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("此会议未关联项目");
}


+ 2
- 1
hz-pm-api/src/main/java/com/hz/pm/api/projectlib/mapper/ProjectMapper.xml View File

@@ -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


+ 3
- 0
hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/dto/ProjectChangeListDTO.java View File

@@ -59,4 +59,7 @@ public class ProjectChangeListDTO {
@ApiModelProperty("变更ID")
private Long changeId;

@ApiModelProperty("是否可重新提交")
private Boolean canResubmit;

}

Loading…
Cancel
Save