From a9a11efb81578ce47fffe36e9b769fc14a05b384 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Fri, 11 Oct 2024 18:07:05 +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;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hz/pm/api/projectdeclared/model/entity/ProjectChangeHistory.java | 4 ++++ .../java/com/hz/pm/api/projectlib/manage/ProjectChangeManage.java | 1 + .../java/com/hz/pm/api/projectlib/model/vo/ProjectChangeListVO.java | 3 +++ 3 files changed, 8 insertions(+) diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/entity/ProjectChangeHistory.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/entity/ProjectChangeHistory.java index 10f663d..f94fe97 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/entity/ProjectChangeHistory.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/entity/ProjectChangeHistory.java @@ -2,6 +2,7 @@ package com.hz.pm.api.projectdeclared.model.entity; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -43,4 +44,7 @@ public class ProjectChangeHistory implements Serializable { private Integer status; + @ApiModelProperty("是否允许重新发起") + private Boolean canResubmit; + } diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectChangeManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectChangeManage.java index d836370..88c4f61 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectChangeManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectChangeManage.java @@ -176,6 +176,7 @@ public class ProjectChangeManage { projectChangeHistory.setProjectId(project.getId()); projectChangeHistory.setProjectCode(project.getProjectCode()); projectChangeHistory.setStatus(ProjectChangeStatus.ON_CHANGE_APPLY.getCode()); + projectChangeHistory.setCanResubmit(Boolean.TRUE); projectChangeHistory.setInstCode(instId); projectChangeHistory.setId(req.getId()); projectChangeHistoryService.saveOrUpdate(projectChangeHistory); diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/vo/ProjectChangeListVO.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/vo/ProjectChangeListVO.java index e8ccabd..5894806 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/vo/ProjectChangeListVO.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/vo/ProjectChangeListVO.java @@ -62,4 +62,7 @@ public class ProjectChangeListVO { @ApiModelProperty("流程实例ID") private String instCode; + @ApiModelProperty("是否可重新提交") + private Boolean canResubmit; + }