main
zhangp 3 years ago
parent 8c86b66584
commit 36be3b289d
  1. 15
      src/main/java/com/zilber/boot/activiti/controller/BpmnController.java
  2. 6
      src/main/java/com/zilber/boot/activiti/dto/TaskCompleteDTO.java

@ -2,10 +2,7 @@ package com.zilber.boot.activiti.controller;
import com.github.pagehelper.PageInfo;
import com.zilber.boot.activiti.dto.DeploymentDTO;
import com.zilber.boot.activiti.dto.InstanceDTO;
import com.zilber.boot.activiti.dto.PageQueryDTO;
import com.zilber.boot.activiti.dto.TaskQueryDTO;
import com.zilber.boot.activiti.dto.*;
import com.zilber.boot.activiti.service.*;
import com.zilber.boot.activiti.vo.DefinitionVO;
import com.zilber.boot.activiti.vo.HistoricTaskVO;
@ -20,6 +17,7 @@ import org.apache.commons.io.IOUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
@ -175,6 +173,15 @@ public class BpmnController {
return AjaxResult.success(page);
}
@PutMapping("/task/{id}")
@ApiOperation("完成任务")
public AjaxResult completeTask(
@PathVariable @NotBlank @ApiParam("流程任务ID") String id,
@RequestBody @Valid TaskCompleteDTO dto) {
taskService.complete(dto.getUserCode(), id, dto);
return AjaxResult.success();
}
@GetMapping("/historic/task/page")
@ApiOperation("查看历史任务")
public AjaxResult historicTaskPage(@Valid TaskQueryDTO dto) {

@ -15,7 +15,7 @@ import java.util.Map;
public class TaskCompleteDTO {
@NotNull(message = "请选择审批结果")
@ApiModelProperty("审批状态:1-通过 0-拒绝(其他可以根据业务自行添加)")
@ApiModelProperty("审批状态:1-通过 0-拒绝")
private Integer status;
@Length(max = 512)
@ -23,6 +23,8 @@ public class TaskCompleteDTO {
private String remark;
@ApiModelProperty(value = "流程变量")
private Map<String,Object> variables;
private Map<String, Object> variables;
@ApiModelProperty("用户")
private String userCode;
}

Loading…
Cancel
Save