wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

我发起的流程 添加 是否驳回到第一节点

This commit is contained in:
wangliwen 2022-05-17 10:34:00 +08:00
parent 3aef51ab1d
commit 9cbba2477b
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
renren-admin/src/main/java/io/renren/modules/activiti/dto/TaskDTO.java
View File

@ -4,7 +4,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -13,7 +12,7 @@ import java.util.Map;
* @author Jone * @author Jone
*/ */
@Data @Data
@Api(tags="任务") @Api(tags = "任务")
public class TaskDTO { public class TaskDTO {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -27,7 +26,7 @@ public class TaskDTO {
private String userId; private String userId;
@ApiModelProperty(value = "任务参数") @ApiModelProperty(value = "任务参数")
private Map<String,Object> params; private Map<String, Object> params;
@ApiModelProperty(value = "流程定义ID") @ApiModelProperty(value = "流程定义ID")
private String processDefinitionId; private String processDefinitionId;
@ -77,4 +76,7 @@ public class TaskDTO {
@ApiModelProperty(value = "流程发起时间") @ApiModelProperty(value = "流程发起时间")
private Date startTime; private Date startTime;
@ApiModelProperty(value = "流程被驳回到第一个用户任务？")
private Boolean backToFirst = Boolean.FALSE;
} }

4
renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java
View File

@ -321,6 +321,10 @@ public class ActHistoryService {
dto.setProcessInstanceId(task.getProcessInstanceId()); dto.setProcessInstanceId(task.getProcessInstanceId());
dto.setOwner(task.getOwner()); dto.setOwner(task.getOwner());
dto.setCreateTime(task.getCreateTime()); dto.setCreateTime(task.getCreateTime());
dto.setParams(task.getProcessVariables());
if (dto.getParams().containsKey("backToFirst")) {
dto.setBackToFirst(Boolean.valueOf(dto.getParams().get("backToFirst").toString()));
}
} }
public ProcessInstanceDTO getHistoryProcessInstanceByBusinessKey(String procDefKey, String businessKey) { public ProcessInstanceDTO getHistoryProcessInstanceByBusinessKey(String procDefKey, String businessKey) {