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

feat(REQ-4586) - 新增根据实例和审批人查询审批日志

Browse Source
This commit is contained in:
wangli 2025-07-07 20:40:03 +08:00
parent 0fe5787975
commit 2bcb1a5590
3 changed files with 46 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@ package cn.axzo.workflow.client.feign.bpmn;
import cn.axzo.workflow.client.annotation.WorkflowEngineFeignClient;
import cn.axzo.workflow.common.annotation.InvokeMode;
import cn.axzo.workflow.common.annotation.Manageable;
import cn.axzo.workflow.common.model.request.bpmn.log.LogApproveSearchDTO;
import cn.axzo.workflow.common.model.request.bpmn.task.BpmnNodeBackSystemOperateDTO;
import cn.axzo.workflow.common.model.request.bpmn.task.BpmnOptionalNodeDTO;
import cn.axzo.workflow.common.model.request.bpmn.task.BpmnRobotTaskCompleteDTO;
@ -108,6 +109,7 @@ public interface ProcessTaskApi {
/**
* 用于系统内部操作，跳转到指定节点
*
* @param dto 请求参数
* @return 是否成功
*/
@ -177,7 +179,7 @@ public interface ProcessTaskApi {
@PostMapping("/api/process/task/countersign")
CommonResponse<Boolean> countersignTask(@Validated @RequestBody BpmnTaskCountersignDTO dto);
/**
/**
* 重置节点审批人（提级审批）
*
* @param dto
@ -306,4 +308,15 @@ public interface ProcessTaskApi {
CommonResponse<Map<String, String>> findTaskIdByInstanceIdsAndPersonId(@RequestParam(required = false) @NotEmpty(message = "流程实例 ID列表 不能为空") List<String> processInstanceIds,
@RequestParam(required = false) @NotBlank(message = "自然人 ID 不能为空") String personId);
/**
*
* @param dto
* @return
*/
@Operation(summary = "根据实例 ID列表 和自然人 ID 查询对应待处理的任务 ID")
@GetMapping("/api/process/task/batch/find")
@Manageable
@InvokeMode(SYNC)
CommonResponse<Void> getProcessLogByInstanceIdAndPersonId(@Validated @RequestBody LogApproveSearchDTO dto);
}

3
workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/dto/OrgStructureSnapshotInfo.java
View File

@ -7,7 +7,6 @@ import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.List;
/**
* 审批人员的组织架构信息
@ -49,7 +48,7 @@ public class OrgStructureSnapshotInfo implements Serializable {
private int workspaceType;
/**
* 项目快照信息
* 组织快照信息
*/
private OrgSnapshotInfo snapshotInfo;

31
workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/log/LogApproveSearchDTO.java Normal file
View File

@ -0,0 +1,31 @@
package cn.axzo.workflow.common.model.request.bpmn.log;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotBlank;
/**
* 用于查询审批日志的人的模型
*
* @author wangli
* @since 2025-07-07 19:40
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class LogApproveSearchDTO {
@NotBlank(message = "流程实例 ID 不能为空")
private String processInstanceId;
@NotBlank(message = "审批人 personId 不能为空")
private String personId;
@NotBlank(message = "审批人 tenantId 不能为空")
private String tenantId;
@NotBlank(message = "审批人 ouId 不能为空")
private String ouId;
}