From b781f0b0fe0d22f290431b18bd57ac0b66443935 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Mon, 2 Mar 2026 15:45:58 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-7125)=20-=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8C=87=E5=AE=9A=E5=AE=A1=E6=89=B9=E7=9A=84?= =?UTF-8?q?=E5=BE=85=E5=AE=A1=E6=89=B9=E4=BB=BB=E5=8A=A1API=20=E5=85=A5?= =?UTF-8?q?=E5=8F=82=E5=92=8C=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/axzo/workflow/client/feign/bpmn/ProcessTaskApi.java | 2 +- .../cn/axzo/workflow/common/code/BpmnInstanceRespCode.java | 2 +- .../common/model/request/bpmn/task/BpmnTaskAuditDTO.java | 3 ++- .../model/request/bpmn/task/BpmnTaskAuditWithFormDTO.java | 6 ++++++ .../common/model/request/bpmn/task/BpmnTaskTransferDTO.java | 3 +-- .../core/service/impl/BpmnProcessTaskServiceImpl.java | 2 +- 6 files changed, 12 insertions(+), 6 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 f4426b5a4..e7690efe3 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 @@ -296,7 +296,7 @@ public interface ProcessTaskApi { @Manageable @InvokeMode(SYNC) CommonResponse> getActiveTasksByProcessInstanceId(@NotBlank(message = "流程实例 ID 不能为空") @RequestParam String processInstanceId, - @NotBlank(message = "租户不能为空") @RequestParam String tenantId); + @RequestParam(required = false) String tenantId); /** * 根据实例 ID 和自然人 ID 查询对应待处理的任务 ID diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/code/BpmnInstanceRespCode.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/code/BpmnInstanceRespCode.java index add605102..a9770b616 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/code/BpmnInstanceRespCode.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/code/BpmnInstanceRespCode.java @@ -31,7 +31,7 @@ public enum BpmnInstanceRespCode implements IModuleRespCode { PROCESS_DOC_READ_PARAM_ERROR("016", "查询审批人阅读状态参数丢失自然人 ID 数据"), PROCESS_DOC_ID_NOT_IN_MODEL("017", "当前流程中，不存在指定文档"), PROCESS_SIGN_DATA_NOT_EXISTS("018", "签署业务审批未获取到初始模板复制数据"), - PROCESS_INSTANCE_CANT_REMIND("019", "流程实例【{}】不存在, 不能评论"), + PROCESS_INSTANCE_CANT_REMIND("019", "流程实例【{}】不存在, 不能催办"), PROCESS_EXT_LOG_PARAM_ERROR("020", "查询流程日志的审批人PersonId参数不合法"), PROCESS_INSTANCE_CREATE_PARAM_ERROR("021", "当前审批业务必须传入叶子节点（CooperationOrgDTO.nodeId）"), ; diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/task/BpmnTaskAuditDTO.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/task/BpmnTaskAuditDTO.java index 0cfe59964..c76f5cf1d 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/task/BpmnTaskAuditDTO.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/task/BpmnTaskAuditDTO.java @@ -10,6 +10,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.springframework.validation.annotation.Validated; import javax.validation.Valid; @@ -28,7 +29,7 @@ import java.util.Map; @Validated @AllArgsConstructor @NoArgsConstructor -@Builder +@SuperBuilder public class BpmnTaskAuditDTO { /** * 流程实例 ID diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/task/BpmnTaskAuditWithFormDTO.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/task/BpmnTaskAuditWithFormDTO.java index 89c35023c..fbf5564fd 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/task/BpmnTaskAuditWithFormDTO.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/task/BpmnTaskAuditWithFormDTO.java @@ -2,8 +2,11 @@ package cn.axzo.workflow.common.model.request.bpmn.task; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import java.util.Map; @@ -15,7 +18,10 @@ import java.util.Map; */ @EqualsAndHashCode(callSuper = true) @Data +@AllArgsConstructor +@NoArgsConstructor @ApiModel(value = "审批任务携带表单数据的入参模型") +@SuperBuilder public class BpmnTaskAuditWithFormDTO extends BpmnTaskAuditDTO { /** diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/task/BpmnTaskTransferDTO.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/task/BpmnTaskTransferDTO.java index f64bc3115..cd2f87088 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/task/BpmnTaskTransferDTO.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/task/BpmnTaskTransferDTO.java @@ -11,7 +11,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import javax.validation.Valid; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import java.io.Serializable; import java.util.List; @@ -31,7 +30,7 @@ public class BpmnTaskTransferDTO implements Serializable { private static final long serialVersionUID = 8142105892475867826L; - /** + /** * 流程实例 ID *

* 与审批任务 ID 二选一 diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java index d4f7f1fa8..6f6982648 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java @@ -756,7 +756,7 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService { @Override public List getActiveTasksByProcessInstanceId(String processInstanceId, String tenantId) { TaskQuery query = taskService.createTaskQuery().processInstanceId(processInstanceId); - if (StringUtils.hasLength(tenantId)) { + if (StringUtils.hasText(tenantId)) { query.taskTenantId(tenantId); } List vos = bpmnTaskConverter.toVos(query.list());