wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(REQ-7125) - 调整查询指定审批的待审批任务API 入参和逻辑

Browse Source
This commit is contained in:
wangli 2026-03-02 15:45:58 +08:00
parent 10f0e6cdfe
commit b781f0b0fe
6 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/bpmn/ProcessTaskApi.java
View File

@ -296,7 +296,7 @@ public interface ProcessTaskApi {
@Manageable
@InvokeMode(SYNC)
CommonResponse<List<BpmnTaskInstanceVO>> getActiveTasksByProcessInstanceId(@NotBlank(message = "流程实例 ID 不能为空") @RequestParam String processInstanceId,
@NotBlank(message = "租户不能为空") @RequestParam String tenantId);
@RequestParam(required = false) String tenantId);
/**
* 根据实例 ID 和自然人 ID 查询对应待处理的任务 ID

2
workflow-engine-common/src/main/java/cn/axzo/workflow/common/code/BpmnInstanceRespCode.java
View File

@ -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）"),
;

3
workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/task/BpmnTaskAuditDTO.java
View File

@ -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

6
workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/task/BpmnTaskAuditWithFormDTO.java
View File

@ -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 {
/**

1
workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/task/BpmnTaskTransferDTO.java
View File

@ -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;

2
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java
View File

@ -756,7 +756,7 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService {
@Override
public List<BpmnTaskInstanceVO> getActiveTasksByProcessInstanceId(String processInstanceId, String tenantId) {
TaskQuery query = taskService.createTaskQuery().processInstanceId(processInstanceId);
if (StringUtils.hasLength(tenantId)) {
if (StringUtils.hasText(tenantId)) {
query.taskTenantId(tenantId);
}
List<BpmnTaskInstanceVO> vos = bpmnTaskConverter.toVos(query.list());