Merge branch 'dev' into featrue/test_featrue
# Conflicts: # workflow-engine-server/src/main/java/cn/axzo/server/controller/web/BpmProcessInstanceController.java # workflow-engine-server/src/main/java/cn/axzo/server/controller/web/BpmTaskController.java
This commit is contained in:
commit
5c75eba012
@ -2,8 +2,14 @@ package cn.axzo.server.controller.web;
|
||||
|
||||
import cn.axzo.workflow.core.service.BpmProcessInstanceService;
|
||||
import cn.axzo.workflow.core.service.dto.request.process.BpmProcessInstanceCreateDTO;
|
||||
import cn.axzo.workflow.core.service.dto.request.process.BpmProcessInstanceMyPageReqVO;
|
||||
import cn.axzo.workflow.core.service.dto.request.task.BpmTaskTodoBpmPageDTO;
|
||||
import cn.axzo.workflow.core.service.dto.response.BpmPageResult;
|
||||
import cn.axzo.workflow.core.service.dto.response.process.BpmProcessInstancePageItemVO;
|
||||
import cn.axzo.workflow.core.service.dto.response.process.BpmProcessInstanceVO;
|
||||
import cn.axzo.workflow.core.service.dto.request.process.BpmProcessInstanceWithdrawDTO;
|
||||
import cn.axzo.workflow.core.service.dto.response.process.BpmProcessInstanceVO;
|
||||
import cn.axzo.workflow.core.service.dto.response.task.BpmTaskTodoPageItemRespVO;
|
||||
import cn.azxo.framework.common.model.CommonResponse;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@ -23,6 +29,16 @@ public class BpmProcessInstanceController {
|
||||
private BpmProcessInstanceService bpmProcessInstanceService;
|
||||
|
||||
|
||||
/**
|
||||
* 我发起的审批列表
|
||||
* */
|
||||
@GetMapping("/getOwnTaskPage")
|
||||
public CommonResponse<BpmPageResult<BpmProcessInstancePageItemVO>> getMyProcessInstancePage(@RequestBody BpmProcessInstanceMyPageReqVO dto) {
|
||||
log.info("我发起的审批列表 getOwnTaskPage===>>>参数：{}", dto);
|
||||
BpmPageResult<BpmProcessInstancePageItemVO> result=bpmProcessInstanceService.getMyProcessInstancePage(dto);
|
||||
return CommonResponse.success(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 发起审核
|
||||
* */
|
||||
|
||||
@ -1,10 +1,19 @@
|
||||
package cn.axzo.server.controller.web;
|
||||
|
||||
import cn.axzo.workflow.core.service.BpmTaskService;
|
||||
import cn.axzo.workflow.core.service.dto.request.task.BpmTaskAuditDTO;
|
||||
import cn.axzo.workflow.core.service.dto.request.task.BpmTaskTodoBpmPageDTO;
|
||||
import cn.axzo.workflow.core.service.dto.response.BpmPageResult;
|
||||
import cn.axzo.workflow.core.service.dto.response.task.BpmTaskTodoPageItemRespVO;
|
||||
import cn.azxo.framework.common.model.CommonResponse;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
@Slf4j
|
||||
@RequestMapping("/web/v1/api/BpmTask")
|
||||
@ -15,76 +24,69 @@ public class BpmTaskController {
|
||||
private BpmTaskService bpmTaskService;
|
||||
|
||||
|
||||
// /**
|
||||
// * 待审核列表
|
||||
// * */
|
||||
// @GetMapping("/getTodoTaskPage")
|
||||
// public CommonResponse<BpmPageResult<BpmTaskTodoPageItemVO>> getTodoTaskPage(@RequestBody BpmTaskTodoBpmPageDTO dto) {
|
||||
// log.info("待审核列表 getTodoTaskPage===>>>参数：{}", dto);
|
||||
// BpmPageResult<BpmTaskTodoPageItemVO> result=bpmTaskService.getTodoTaskPage(dto);
|
||||
// return CommonResponse.success(result);
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 已完成的审批列表
|
||||
// * */
|
||||
// @GetMapping("/getDoneTaskPage")
|
||||
// public CommonResponse<BpmPageResult<BpmTaskTodoPageItemRespVO>> getDoneTaskPage(@RequestBody BpmTaskTodoBpmPageDTO dto) {
|
||||
// log.info("已完成的审批列表 getDoneTaskPage===>>>参数：{}", dto);
|
||||
// BpmPageResult<BpmTaskTodoPageItemRespVO> result=bpmTaskService.getDoneTaskPage(dto);
|
||||
// return CommonResponse.success(result);
|
||||
// }
|
||||
//
|
||||
//
|
||||
// /**
|
||||
// * 我发起的审批列表
|
||||
// * */
|
||||
// @GetMapping("/getOwnTaskPage")
|
||||
// public CommonResponse<BpmPageResult<BpmTaskTodoPageItemRespVO>> getOwnTaskPage(@RequestBody BpmTaskTodoBpmPageDTO dto) {
|
||||
// log.info("我发起的审批列表 getOwnTaskPage===>>>参数：{}", dto);
|
||||
// BpmPageResult<BpmTaskTodoPageItemRespVO> result=bpmTaskService.getOwnTaskPage(dto);
|
||||
// return CommonResponse.success(result);
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 同意
|
||||
// * */
|
||||
// @PostMapping("/approveTask")
|
||||
// public CommonResponse approveTask(@RequestBody BpmTaskAuditDTO dto) {
|
||||
// log.info("同意 approveTask===>>>参数：{}", dto);
|
||||
// bpmTaskService.approveTask(dto);
|
||||
// return CommonResponse.success();
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 拒绝
|
||||
// * */
|
||||
// @PostMapping("/rejectTask")
|
||||
// public CommonResponse rejectTask(@RequestBody BpmTaskAuditDTO dto) {
|
||||
// log.info("拒绝 rejectTask===>>>参数：{}", dto);
|
||||
// bpmTaskService.rejectTask(dto);
|
||||
// return CommonResponse.success();
|
||||
// }
|
||||
//
|
||||
//
|
||||
// /**
|
||||
// * 获取历史已审批的列表详情
|
||||
// */
|
||||
// @GetMapping("/getTaskListByProcessInstanceId")
|
||||
// public CommonResponse<List<HistoricTaskInstance>> getTaskListByProcessInstanceId(@RequestBody String processInstanceId) {
|
||||
// log.info("获取历史已审批的列表详情 getTaskListByProcessInstanceId===>>>参数：{}", processInstanceId);
|
||||
// List<HistoricTaskInstance> result=bpmTaskService.getTaskListByProcessInstanceId(processInstanceId);
|
||||
// return CommonResponse.success(result);
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 获取实例正在审核的人列表
|
||||
// * */
|
||||
// @GetMapping("/getActiveTasksByProcessInstanceId")
|
||||
// public CommonResponse<List<Task>> getActiveTasksByProcessInstanceId(@RequestBody String processInstanceId) {
|
||||
// log.info(" 获取实例正在审核的人列表 getActiveTasksByProcessInstanceId===>>>参数：{}", processInstanceId);
|
||||
// List<Task> result=bpmTaskService.getActiveTasksByProcessInstanceId(processInstanceId);
|
||||
// return CommonResponse.success(result);
|
||||
// }
|
||||
|
||||
/**
|
||||
* 待审核列表
|
||||
* */
|
||||
@GetMapping("/getTodoTaskPage")
|
||||
public CommonResponse<BpmPageResult<BpmTaskTodoPageItemRespVO>> getTodoTaskPage(@RequestBody BpmTaskTodoBpmPageDTO dto) {
|
||||
log.info("待审核列表 getTodoTaskPage===>>>参数：{}", dto);
|
||||
BpmPageResult<BpmTaskTodoPageItemRespVO> result=bpmTaskService.getTodoTaskPage(dto);
|
||||
return CommonResponse.success(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 已完成的审批列表
|
||||
* */
|
||||
@GetMapping("/getDoneTaskPage")
|
||||
public CommonResponse<BpmPageResult<BpmTaskTodoPageItemRespVO>> getDoneTaskPage(@RequestBody BpmTaskTodoBpmPageDTO dto) {
|
||||
log.info("已完成的审批列表 getDoneTaskPage===>>>参数：{}", dto);
|
||||
BpmPageResult<BpmTaskTodoPageItemRespVO> result=bpmTaskService.getDoneTaskPage(dto);
|
||||
return CommonResponse.success(result);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 同意
|
||||
* */
|
||||
@PostMapping("/approveTask")
|
||||
public CommonResponse approveTask(@RequestBody BpmTaskAuditDTO dto) {
|
||||
log.info("同意 approveTask===>>>参数：{}", dto);
|
||||
bpmTaskService.approveTask(dto);
|
||||
return CommonResponse.success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 拒绝
|
||||
* */
|
||||
@PostMapping("/rejectTask")
|
||||
public CommonResponse rejectTask(@RequestBody BpmTaskAuditDTO dto) {
|
||||
log.info("拒绝 rejectTask===>>>参数：{}", dto);
|
||||
bpmTaskService.rejectTask(dto);
|
||||
return CommonResponse.success();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取历史已审批的列表详情
|
||||
*/
|
||||
@GetMapping("/getTaskListByProcessInstanceId")
|
||||
public CommonResponse<List<HistoricTaskInstance>> getTaskListByProcessInstanceId(@RequestBody String processInstanceId) {
|
||||
log.info("获取历史已审批的列表详情 getTaskListByProcessInstanceId===>>>参数：{}", processInstanceId);
|
||||
List<HistoricTaskInstance> result=bpmTaskService.getTaskListByProcessInstanceId(processInstanceId);
|
||||
return CommonResponse.success(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取实例正在审核的人列表
|
||||
* */
|
||||
@GetMapping("/getActiveTasksByProcessInstanceId")
|
||||
public CommonResponse<List<Task>> getActiveTasksByProcessInstanceId(@RequestBody String processInstanceId) {
|
||||
log.info(" 获取实例正在审核的人列表 getActiveTasksByProcessInstanceId===>>>参数：{}", processInstanceId);
|
||||
List<Task> result=bpmTaskService.getActiveTasksByProcessInstanceId(processInstanceId);
|
||||
return CommonResponse.success(result);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user