From 839f9a6b5b20f57c98d168e101fcb43069aa22e5 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Sat, 7 Oct 2023 14:49:14 +0800 Subject: [PATCH] =?UTF-8?q?update=20-=20=E8=B0=83=E6=95=B4=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E6=A8=A1=E5=9E=8B=E7=9A=84=E7=A7=9F=E6=88=B7=20ID=20?= =?UTF-8?q?=E4=B8=BA=E9=9D=9E=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/feign/bpmn/ProcessTaskApi.java | 11 ++++++++--- .../BpmnBasicProcessInstanceQueryDTO.java | 4 ++-- .../web/bpmn/BpmnTaskController.java | 18 ++++++++++++++---- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/bpmn/ProcessTaskApi.java b/workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/bpmn/ProcessTaskApi.java index 2e24321e9..2082f98db 100644 --- a/workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/bpmn/ProcessTaskApi.java +++ b/workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/bpmn/ProcessTaskApi.java @@ -4,7 +4,11 @@ import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskAssigneeDTO; import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskAuditDTO; import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskPageSearchDTO; import cn.axzo.workflow.common.model.response.BpmPageResult; -import cn.axzo.workflow.common.model.response.bpmn.task.*; +import cn.axzo.workflow.common.model.response.bpmn.task.BpmnHistoricTaskInstanceGroupVO; +import cn.axzo.workflow.common.model.response.bpmn.task.BpmnHistoricTaskInstanceVO; +import cn.axzo.workflow.common.model.response.bpmn.task.BpmnTaskDonePageItemVO; +import cn.axzo.workflow.common.model.response.bpmn.task.BpmnTaskInstanceVO; +import cn.axzo.workflow.common.model.response.bpmn.task.BpmnTaskTodoPageItemVO; import cn.axzo.workflow.common.valid.group.ValidGroup; import cn.azxo.framework.common.model.CommonResponse; import io.swagger.v3.oas.annotations.Operation; @@ -15,6 +19,7 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; +import javax.annotation.Nullable; import javax.validation.constraints.NotBlank; import java.util.List; @@ -84,7 +89,7 @@ public interface ProcessTaskApi { */ @GetMapping("/api/process/task/list/flat") CommonResponse> getTaskListFlatByProcessInstanceId(@NotBlank(message = "流程实例 ID " + - "不能为空") @RequestParam String processInstanceId, @NotBlank(message = "租户不能为空") @RequestParam String tenantId); + "不能为空") @RequestParam String processInstanceId, @Nullable @RequestParam(required = false) String tenantId); /** * 获取指定流程实例的审批过程信息 @@ -93,7 +98,7 @@ public interface ProcessTaskApi { */ @GetMapping("/api/process/task/list/group") CommonResponse> getTaskListGroupByProcessInstanceId(@NotBlank(message = - "流程实例 ID 不能为空") @RequestParam String processInstanceId, @NotBlank(message = "租户不能为空") @RequestParam String tenantId); + "流程实例 ID 不能为空") @RequestParam String processInstanceId, @Nullable @RequestParam(required = false) String tenantId); /** * 获取实例正在审核的人列表 diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/process/BpmnBasicProcessInstanceQueryDTO.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/process/BpmnBasicProcessInstanceQueryDTO.java index f2bb7f56c..4f70773cb 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/process/BpmnBasicProcessInstanceQueryDTO.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/process/BpmnBasicProcessInstanceQueryDTO.java @@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotBlank; +import javax.annotation.Nullable; /** * 最基础的流程实例查询入参模型 @@ -31,6 +31,6 @@ public class BpmnBasicProcessInstanceQueryDTO { * 租户 ID */ @ApiModelProperty("租户 ID") - @NotBlank(message = "租户不能为空") + @Nullable private String tenantId; } diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnTaskController.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnTaskController.java index b1b4736f2..c717ef5ad 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnTaskController.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnTaskController.java @@ -5,7 +5,11 @@ import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskAssigneeDTO; import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskAuditDTO; import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskPageSearchDTO; import cn.axzo.workflow.common.model.response.BpmPageResult; -import cn.axzo.workflow.common.model.response.bpmn.task.*; +import cn.axzo.workflow.common.model.response.bpmn.task.BpmnHistoricTaskInstanceGroupVO; +import cn.axzo.workflow.common.model.response.bpmn.task.BpmnHistoricTaskInstanceVO; +import cn.axzo.workflow.common.model.response.bpmn.task.BpmnTaskDonePageItemVO; +import cn.axzo.workflow.common.model.response.bpmn.task.BpmnTaskInstanceVO; +import cn.axzo.workflow.common.model.response.bpmn.task.BpmnTaskTodoPageItemVO; import cn.axzo.workflow.common.valid.group.ValidGroup; import cn.axzo.workflow.core.service.BpmnTaskService; import cn.azxo.framework.common.model.CommonResponse; @@ -13,8 +17,14 @@ import io.swagger.v3.oas.annotations.Operation; import lombok.extern.slf4j.Slf4j; import org.flowable.form.api.FormInfo; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Nullable; import javax.annotation.Resource; import javax.validation.constraints.NotBlank; import java.util.List; @@ -92,7 +102,7 @@ public class BpmnTaskController implements ProcessTaskApi { @Override public CommonResponse> getTaskListFlatByProcessInstanceId( @NotBlank(message = "流程实例 ID 不能为空") @RequestParam String processInstanceId, - @NotBlank(message = "租户不能为空") @RequestParam String tenantId) { + @Nullable @RequestParam(required = false) String tenantId) { log.info("获取历史已审批的列表详情 getTaskListByProcessInstanceId===>>>参数：{}", processInstanceId); return success(bpmnTaskService.getHistoricTaskListByProcessInstanceId(processInstanceId, tenantId)); } @@ -106,7 +116,7 @@ public class BpmnTaskController implements ProcessTaskApi { @Override public CommonResponse> getTaskListGroupByProcessInstanceId( @NotBlank(message = "流程实例 ID 不能为空") @RequestParam String processInstanceId, - @NotBlank(message = "租户不能为空") @RequestParam String tenantId) { + @Nullable @RequestParam(required = false) String tenantId) { log.info("获取历史已审批的列表详情 getTaskListByProcessInstanceId===>>>参数：{}", processInstanceId); return success(bpmnTaskService.getHistoricTaskListGroupByProcessInstanceId(processInstanceId, tenantId)); }