diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java index 3fec8c1..47b456a 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java @@ -149,7 +149,10 @@ public class DeclaredProjectManage { log.info("申报项目成功 【{}】", instanceId); //如果是重新提交的话 判断下 项目是否存在 - saveOrUpdateProject(projectInfo, instanceId,userId); + if(saveOrUpdateProject(projectInfo, instanceId,userId) && Objects.nonNull(projectInfo.getDraftId())){ + //如果是草稿箱提交 删除对应的草稿箱 + projectDraftService.removeById(projectInfo.getDraftId()); + } return instanceId; } @@ -221,7 +224,7 @@ public class DeclaredProjectManage { * @param projectDto * @param instanceId */ - private void saveOrUpdateProject(ProjectDTO projectDto, String instanceId, + private Boolean saveOrUpdateProject(ProjectDTO projectDto, String instanceId, Long userId) { //流程启动之后 入库项目 重要业务信息 用于列表查询 展示 try { @@ -260,6 +263,7 @@ public class DeclaredProjectManage { log.error("项目信息入库错误 ", e); throw new BusinessException("项目信息入库错误 :" + e.getMessage()); } + return Boolean.TRUE; } public PageVo pageDraft(DeclaredProjectListParamDTO params) { diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java index 8327f3d..d8efc71 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java @@ -28,6 +28,9 @@ public class ProjectDTO implements Serializable { @ApiModelProperty("主键") private Long id; + @ApiModelProperty("如果是通过草稿箱提交的 要传下草稿id") + private Long draftId; + @ApiModelProperty("所属地区编号") private String areaCode;