|
|
@ -2,10 +2,7 @@ package com.zilber.boot.activiti.controller; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import com.github.pagehelper.PageInfo; |
|
|
|
import com.github.pagehelper.PageInfo; |
|
|
|
import com.zilber.boot.activiti.dto.DeploymentDTO; |
|
|
|
import com.zilber.boot.activiti.dto.*; |
|
|
|
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.service.*; |
|
|
|
import com.zilber.boot.activiti.service.*; |
|
|
|
import com.zilber.boot.activiti.vo.DefinitionVO; |
|
|
|
import com.zilber.boot.activiti.vo.DefinitionVO; |
|
|
|
import com.zilber.boot.activiti.vo.HistoricTaskVO; |
|
|
|
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.validation.annotation.Validated; |
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
import org.springframework.web.multipart.MultipartFile; |
|
|
|
import org.springframework.web.multipart.MultipartFile; |
|
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource; |
|
|
|
import javax.annotation.Resource; |
|
|
|
import javax.servlet.http.HttpServletResponse; |
|
|
|
import javax.servlet.http.HttpServletResponse; |
|
|
|
import javax.validation.Valid; |
|
|
|
import javax.validation.Valid; |
|
|
@ -175,6 +173,15 @@ public class BpmnController { |
|
|
|
return AjaxResult.success(page); |
|
|
|
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") |
|
|
|
@GetMapping("/historic/task/page") |
|
|
|
@ApiOperation("查看历史任务") |
|
|
|
@ApiOperation("查看历史任务") |
|
|
|
public AjaxResult historicTaskPage(@Valid TaskQueryDTO dto) { |
|
|
|
public AjaxResult historicTaskPage(@Valid TaskQueryDTO dto) { |
|
|
|