diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/constant/WorkNotice.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/constant/WorkNotice.java index 3e63563..986117b 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/constant/WorkNotice.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/constant/WorkNotice.java @@ -5,10 +5,12 @@ package com.ningdatech.pmapi.todocenter.constant; * @since 2023/02/01 14:56 */ public interface WorkNotice { - public final String PASS_MSG_TEMPLATE = "标题:审核任务 内容:【%s】的【%s】需要您审核。"; + public final String PASS_MSG_TEMPLATE = "【%s】的【%s】需要您审核。"; public final String PASS_MSG_TEMPLATE2 = "【%s】已通过【%s】,请及时开始下一步操作。"; public final String BACK_MSG_TEMPLATE = "【%s】的【%s】被退回,请及时处理。"; public final String REJECT_MSG_TEMPLATE = "【%s】的【%s】被驳回,请及时处理。"; + public final String AUDIT_WORK_TITLE = "审核任务"; + } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java index 4674040..f4c4c3a 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java @@ -14,6 +14,7 @@ import javax.servlet.http.HttpServletResponse; import com.ningdatech.pmapi.projectdeclared.manage.DeclaredProjectManage; import com.ningdatech.pmapi.projectdeclared.model.dto.ProjectDraftSaveDTO; +import com.ningdatech.pmapi.todocenter.constant.WorkNotice; import com.ningdatech.pmapi.user.security.auth.model.UserInfoDetails; import com.wflow.workflow.enums.ProcessStatusEnum; import org.apache.commons.io.FileUtils; @@ -446,6 +447,8 @@ public class TodoCenterManage { ProjectDraftSaveDTO draftSaveDto = new ProjectDraftSaveDTO(); BeanUtils.copyProperties(declaredProject,draftSaveDto); declaredProjectManage.saveToDraft(draftSaveDto); + // 并删除项目库中该项目信息 + projectService.removeById(declaredProject); break; // 当前项目状态是预审中 case PRE_APPLYING: @@ -607,7 +610,7 @@ public class TodoCenterManage { */ private void assemblyAuditNotify(Long userId, Project project, String msg) { Notify notify = new Notify(); - notify.setTitle(msg); + notify.setTitle(AUDIT_WORK_TITLE); notify.setUserId(userId); notify.setType(MsgTypeEnum.PROJECT_REVIEW.name()); notify.setInstanceId(project.getInstCode());