Browse Source

Merge remote-tracking branch 'origin/master'

master
WendyYang 1 year ago
parent
commit
a6a3d8034c
2 changed files with 7 additions and 2 deletions
  1. +3
    -1
      pmapi/src/main/java/com/ningdatech/pmapi/todocenter/constant/WorkNotice.java
  2. +4
    -1
      pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java

+ 3
- 1
pmapi/src/main/java/com/ningdatech/pmapi/todocenter/constant/WorkNotice.java View File

@@ -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 = "审核任务";


}

+ 4
- 1
pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java View File

@@ -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());


Loading…
Cancel
Save