Browse Source

优化 processType

master
PoffyZhang 1 year ago
parent
commit
8fdc9a737f
3 changed files with 8 additions and 8 deletions
  1. +2
    -2
      pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/entity/dto/DeclaredProjectDto.java
  2. +2
    -2
      pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/entity/dto/ProjectDraftSaveDto.java
  3. +4
    -4
      pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java

+ 2
- 2
pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/entity/dto/DeclaredProjectDto.java View File

@@ -2,7 +2,7 @@ package com.ningdatech.pmapi.projectdeclared.entity.dto;


import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO;
import com.ningdatech.pmapi.projectlib.model.dto.ProjectDto;
import com.wflow.workflow.bean.dto.ProcessInstanceUserDto; import com.wflow.workflow.bean.dto.ProcessInstanceUserDto;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
@@ -26,7 +26,7 @@ import java.util.Map;
public class DeclaredProjectDto implements Serializable { public class DeclaredProjectDto implements Serializable {


@NotNull @NotNull
private ProjectDTO projectInfo;
private ProjectDto projectInfo;


private Map<String,Object> formData; private Map<String,Object> formData;




+ 2
- 2
pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/entity/dto/ProjectDraftSaveDto.java View File

@@ -1,6 +1,6 @@
package com.ningdatech.pmapi.projectdeclared.entity.dto; package com.ningdatech.pmapi.projectdeclared.entity.dto;


import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO;
import com.ningdatech.pmapi.projectlib.model.dto.ProjectDto;
import com.wflow.workflow.bean.dto.ProcessInstanceUserDto; import com.wflow.workflow.bean.dto.ProcessInstanceUserDto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import lombok.*; import lombok.*;
@@ -26,7 +26,7 @@ public class ProjectDraftSaveDto implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;


@NotNull @NotNull
private ProjectDTO projectInfo;
private ProjectDto projectInfo;


@NotNull @NotNull
private ProcessInstanceUserDto user; private ProcessInstanceUserDto user;


+ 4
- 4
pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java View File

@@ -16,7 +16,7 @@ import com.ningdatech.pmapi.projectdeclared.entity.dto.ProjectDraftSaveDto;
import com.ningdatech.pmapi.projectdeclared.entity.vo.ProjectDraftVo; import com.ningdatech.pmapi.projectdeclared.entity.vo.ProjectDraftVo;
import com.ningdatech.pmapi.projectdeclared.service.IProjectDraftService; import com.ningdatech.pmapi.projectdeclared.service.IProjectDraftService;
import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum;
import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO;
import com.ningdatech.pmapi.projectlib.model.dto.ProjectDto;
import com.ningdatech.pmapi.projectlib.model.entity.Project; import com.ningdatech.pmapi.projectlib.model.entity.Project;
import com.ningdatech.pmapi.projectlib.model.entity.ProjectApplication; import com.ningdatech.pmapi.projectlib.model.entity.ProjectApplication;
import com.ningdatech.pmapi.projectlib.service.IProjectApplicationService; import com.ningdatech.pmapi.projectlib.service.IProjectApplicationService;
@@ -104,7 +104,7 @@ public class DeclaredProjectManage {
* @return * @return
*/ */
public String startTheProcess(DeclaredProjectDto dto) { public String startTheProcess(DeclaredProjectDto dto) {
ProjectDTO projectInfo = dto.getProjectInfo();
ProjectDto projectInfo = dto.getProjectInfo();
String regionCode = projectInfo.getAreaCode(); String regionCode = projectInfo.getAreaCode();


WflowModels model = processModelService.getOne(Wrappers.lambdaQuery(WflowModels.class) WflowModels model = processModelService.getOne(Wrappers.lambdaQuery(WflowModels.class)
@@ -145,7 +145,7 @@ public class DeclaredProjectManage {
* @param projectDto * @param projectDto
* @param instanceId * @param instanceId
*/ */
private void saveProject(ProjectDTO projectDto, String instanceId, String regionCode) {
private void saveProject(ProjectDto projectDto, String instanceId, String regionCode) {
//流程启动之后 入库项目 重要业务信息 用于列表查询 展示 //流程启动之后 入库项目 重要业务信息 用于列表查询 展示
try { try {
//保存项目表信息 //保存项目表信息
@@ -181,7 +181,7 @@ public class DeclaredProjectManage {
* @return * @return
*/ */
public Long saveToDraft(ProjectDraftSaveDto dto) { public Long saveToDraft(ProjectDraftSaveDto dto) {
ProjectDTO projectInfo = dto.getProjectInfo();
ProjectDto projectInfo = dto.getProjectInfo();
ProjectDraft draft = new ProjectDraft(); ProjectDraft draft = new ProjectDraft();
BeanUtils.copyProperties(projectInfo, draft); BeanUtils.copyProperties(projectInfo, draft);
draft.setUserId(dto.getUser().getUserId()); draft.setUserId(dto.getUser().getUserId());


Loading…
Cancel
Save