diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/dto/TaskDTO.java b/renren-admin/src/main/java/io/renren/modules/activiti/dto/TaskDTO.java index cfa1ca47..38fce121 100644 --- a/renren-admin/src/main/java/io/renren/modules/activiti/dto/TaskDTO.java +++ b/renren-admin/src/main/java/io/renren/modules/activiti/dto/TaskDTO.java @@ -4,7 +4,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotBlank; import java.util.Date; import java.util.List; import java.util.Map; @@ -13,7 +12,7 @@ import java.util.Map; * @author Jone */ @Data -@Api(tags="任务") +@Api(tags = "任务") public class TaskDTO { private static final long serialVersionUID = 1L; @@ -27,7 +26,7 @@ public class TaskDTO { private String userId; @ApiModelProperty(value = "任务参数") - private Map params; + private Map params; @ApiModelProperty(value = "流程定义ID") private String processDefinitionId; @@ -77,4 +76,7 @@ public class TaskDTO { @ApiModelProperty(value = "流程发起时间") private Date startTime; + @ApiModelProperty(value = "流程被驳回到第一个用户任务?") + private Boolean backToFirst = Boolean.FALSE; + } diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java b/renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java index 2fd4bcf4..a3789d42 100644 --- a/renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java +++ b/renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java @@ -321,6 +321,10 @@ public class ActHistoryService { dto.setProcessInstanceId(task.getProcessInstanceId()); dto.setOwner(task.getOwner()); 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) {