打卡注释Controller

This commit is contained in:
lvshaohua 2023-07-11 10:01:30 +08:00
parent c9f3b07d44
commit 9a80c838ae
2 changed files with 82 additions and 71 deletions

View File

@ -3,8 +3,13 @@ package cn.axzo.server.controller.web;
import cn.axzo.framework.jackson.utility.JSON;
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.task.BpmTaskTodoPageItemRespVO;
import cn.azxo.framework.common.model.CommonResponse;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.history.HistoricProcessInstance;
@ -23,6 +28,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);
}
/**
* 发起审核
* */

View File

@ -3,6 +3,8 @@ 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.flowable.task.api.Task;
@ -10,6 +12,7 @@ import org.flowable.task.api.history.HistoricTaskInstance;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
@Slf4j
@ -21,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);
}
}