feat(REQ-4624) - 调整表单数据转换为 wps 变量的逻辑

2025-08-05 16:14:35 +08:00 · 2025-08-05 16:14:35 +08:00 · b4422c34f0
commit b4422c34f0
parent f916a1b5e1
4 changed files with 175 additions and 110 deletions
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomGetProcessInstanceVariablesToObjectCmd.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomGetProcessInstanceVariablesToObjectCmd.java
@ -75,7 +75,7 @@ public class CustomGetProcessInstanceVariablesToObjectCmd extends AbstractComman

    private final String processInstanceId;
    private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss");
-    private static final List<String> SUPPORTED_FORM_TYPES = Lists.newArrayList("input", "date", "textarea", "image", "contacts", "amount");
+    private static final List<String> SUPPORTED_FORM_TYPES = Lists.newArrayList("input", "date", "textarea", "image", "contacts", "amount", "decimal");

    public CustomGetProcessInstanceVariablesToObjectCmd(String processInstanceId) {
        this.processInstanceId = processInstanceId;
@ -210,6 +210,15 @@ public class CustomGetProcessInstanceVariablesToObjectCmd extends AbstractComman
                                        .type(convert(field.getType()))
                                        .build());
                            }
+                        } else if (Objects.equals(field.getType(), "decimal")) {
+                            if (StringUtils.hasText(fieldValue.toString())) {
+                                variables.add(VariableObjectDTO.builder()
+                                        .key(field.getId())
+                                        .desc(field.getName())
+                                        .value(fieldValue + String.valueOf(field.getParam("unit")))
+                                        .type(convert(field.getType()))
+                                        .build());
+                            }
                        } else {
                            variables.add(VariableObjectDTO.builder()
                                    .key(field.getId())
@ -300,6 +309,7 @@ public class CustomGetProcessInstanceVariablesToObjectCmd extends AbstractComman
            case "textarea":
            case "amount":
            case "contacts":
+            case "decimal":
                return VariableObjectDTO.Type.text;
            case "image":
                return VariableObjectDTO.Type.img;
--- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/TestController.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/TestController.java
@ -2,12 +2,14 @@ package cn.axzo.workflow.server.controller.web;

 import cn.axzo.framework.domain.ServiceException;
 import cn.axzo.workflow.client.feign.bpmn.ProcessInstanceApi;
+import cn.axzo.workflow.common.model.dto.VariableObjectDTO;
 import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceAbortDTO;
 import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceQueryDTO;
 import cn.axzo.workflow.common.model.request.form.definition.FormContentSearchDTO;
 import cn.axzo.workflow.common.model.request.form.instance.FormInstanceSearchDTO;
 import cn.axzo.workflow.common.model.response.bpmn.process.BpmnProcessInstanceVO;
 import cn.axzo.workflow.common.model.response.bpmn.process.ProcessNodeDetailVO;
+import cn.axzo.workflow.core.engine.cmd.CustomGetProcessInstanceVariablesToObjectCmd;
 import cn.axzo.workflow.core.repository.entity.ExtAxBpmnFormRelation;
 import cn.axzo.workflow.core.service.BpmnProcessInstanceService;
 import cn.axzo.workflow.core.service.ExtAxBpmnFormRelationService;
@ -18,8 +20,10 @@ import cn.axzo.workflow.server.common.util.ShellUtil;
 import cn.axzo.workflow.server.xxljob.EsIndexOperationJobHandler;
 import cn.axzo.workflow.server.xxljob.SpecifyProcessInstanceSyncEsJobHandler;
 import cn.azxo.framework.common.model.CommonResponse;
+import com.alibaba.fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.bpmn.model.FlowElement;
+import org.flowable.common.engine.impl.interceptor.CommandExecutor;
 import org.flowable.common.engine.impl.util.IoUtil;
 import org.flowable.engine.HistoryService;
 import org.flowable.engine.RepositoryService;
@ -368,5 +372,13 @@ public class TestController {
        specifyProcessInstanceSyncEsJobHandler.execute(processInstanceId);
        return CommonResponse.success();
    }
+
+    @GetMapping("/wps/variables")
+    public CommonResponse<String> getWpsVariables(@RequestParam String processInstanceId) {
+        CommandExecutor commandExecutor = processEngineConfiguration.getCommandExecutor();
+        List<VariableObjectDTO> wpsVariables =
+                commandExecutor.execute(new CustomGetProcessInstanceVariablesToObjectCmd(processInstanceId));
+        return CommonResponse.success(JSON.toJSONString(wpsVariables));
+    }
 }

--- a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/api/WorkflowCoreService.java
+++ b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/api/WorkflowCoreService.java
@ -1,58 +1,62 @@
 package cn.axzo.workflow.starter.api;

-import cn.axzo.workflow.starter.feign.ext.WorkflowEngineStarterFeignConfiguration;
-import cn.axzo.workflow.common.util.ThreadUtil;
-import static cn.axzo.workflow.common.enums.RpcInvokeModeEnum.ASYNC;
-import static cn.axzo.workflow.common.enums.RpcInvokeModeEnum.SYNC;
-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.activity.BpmnActivityTimeoutCallbackDTO;
-import cn.axzo.workflow.common.model.request.bpmn.activity.BpmnActivityTimeoutTriggerDTO;
-import cn.azxo.framework.common.model.CommonResponse;
-import io.swagger.v3.oas.annotations.Operation;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import javax.validation.constraints.NotBlank;
 import cn.axzo.workflow.common.model.dto.SignFileDTO;
 import cn.axzo.workflow.common.model.dto.SimpleDocDTO;
 import cn.axzo.workflow.common.model.request.bpmn.process.BeforeProcessInstanceCreateDTO;
 import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceAbortDTO;
-import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceAdminPageReqVO;
 import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceCancelDTO;
 import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceCarbonCopyDTO;
-import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceCheckApproverDTO;
 import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceCreateDTO;
 import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceLogQueryDTO;
-import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceMyPageReqVO;
 import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceQueryDTO;
-import cn.axzo.workflow.common.model.request.bpmn.process.SuperBpmnProcessInstanceCancelDTO;
 import cn.axzo.workflow.common.model.request.bpmn.process.doc.ApproverReadStatusDTO;
 import cn.axzo.workflow.common.model.request.bpmn.process.doc.ChangeApproverReadStatusDTO;
 import cn.axzo.workflow.common.model.request.bpmn.process.doc.ProcessDocQueryDTO;
+import cn.axzo.workflow.common.model.request.bpmn.task.BpmnActivitySetAssigneeDTO;
+import cn.axzo.workflow.common.model.request.bpmn.task.BpmnActivityTriggerDTO;
+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;
+import cn.axzo.workflow.common.model.request.bpmn.task.BpmnRobotTaskCreateDTO;
+import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskAuditDTO;
+import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskAuditWithFormDTO;
+import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskBackAuditDTO;
+import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskButtonSearchDTO;
+import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskCommentDTO;
+import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskCountersignDTO;
+import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskResetApproversDTO;
+import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskTransferDTO;
+import cn.axzo.workflow.common.model.request.form.definition.StartFormSearchDTO;
+import cn.axzo.workflow.common.model.request.form.instance.FormDetailDTO;
 import cn.axzo.workflow.common.model.request.form.instance.FormVariablesUpdateDTO;
-import cn.axzo.workflow.common.model.response.BpmPageResult;
+import cn.axzo.workflow.common.model.request.form.instance.FromDataSearchDTO;
 import cn.axzo.workflow.common.model.response.bpmn.BatchOperationResultVO;
-import cn.axzo.workflow.common.model.response.bpmn.process.BpmnProcessInstanceAdminPageItemVO;
 import cn.axzo.workflow.common.model.response.bpmn.process.BpmnProcessInstanceLogVO;
-import cn.axzo.workflow.common.model.response.bpmn.process.BpmnProcessInstancePageItemVO;
 import cn.axzo.workflow.common.model.response.bpmn.process.BpmnProcessInstanceVO;
 import cn.axzo.workflow.common.model.response.bpmn.process.NodesByModelVO;
-import cn.axzo.workflow.common.model.response.bpmn.process.ProcessNodeDetailVO;
 import cn.axzo.workflow.common.model.response.bpmn.process.doc.DocPendingVO;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import cn.axzo.workflow.common.model.response.bpmn.task.BpmnTaskButtonVo;
+import cn.axzo.workflow.common.model.response.form.definition.FormDefinitionVO;
+import cn.axzo.workflow.common.model.response.form.instance.FormDataVO;
+import cn.axzo.workflow.common.model.response.form.instance.FormInstanceVO;
+import cn.axzo.workflow.common.util.ThreadUtil;
+import cn.axzo.workflow.starter.feign.ext.WorkflowEngineStarterFeignConfiguration;
+import io.swagger.v3.oas.annotations.Operation;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
 import javax.annotation.Nullable;
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
 import java.util.List;
 import java.util.Map;
-import cn.axzo.workflow.common.model.request.bpmn.task.*;
-import cn.axzo.workflow.common.model.response.bpmn.task.*;
-import javax.validation.constraints.NotEmpty;
+
+import static cn.axzo.workflow.common.enums.RpcInvokeModeEnum.ASYNC;
+import static cn.axzo.workflow.common.enums.RpcInvokeModeEnum.SYNC;

 /**
 * Workflow Engine Starter Core Service
@ -97,6 +101,39 @@ public interface WorkflowCoreService {
    @Operation(summary = "业务节点设置审批人，不支持重复调用设置审批人，需一次性传入所有审批人")
    Boolean setAssignee(@Validated @RequestBody BpmnActivitySetAssigneeDTO dto);

+    /**
+     * 获取流程配置的表单模型和权限，主要用于发起页
+     *
+     * @param dto
+     * @return
+     */
+    @PostMapping("/api/form/admin/start/form")
+    @InvokeMode(SYNC)
+    FormDefinitionVO getFormDefinition(@Validated @RequestBody StartFormSearchDTO dto);
+
+    /**
+     * 查询指定审批实例的表单模型和数据
+     * <p>
+     * dto 中的 processInstanceId 与 taskId，至少有一个属性有值，一般建议直接使用实例 ID。
+     * 当传入 taskId 时，将只查询该任务绑定的表单模型和数据。
+     *
+     * @param dto
+     * @return
+     */
+    @PostMapping("/api/form/admin/instance/render")
+    @InvokeMode(SYNC)
+    FormInstanceVO getFormInstance(@Validated @RequestBody FormDetailDTO dto);
+
+    /**
+     * 获取流程中表单直接数据，不包含模型
+     *
+     * @param dto
+     * @return
+     */
+    @PostMapping("/instance/form/data")
+    @InvokeMode(SYNC)
+    List<FormDataVO> getFormData(@Validated @RequestBody FromDataSearchDTO dto);
+
    /**
     * 创建流程前的节点列表
     * 用于发起人自选
@ -322,6 +359,7 @@ public interface WorkflowCoreService {

    /**
     * 用于系统内部操作，跳转到指定节点
+     *
     * @param dto 请求参数
     * @return 是否成功
     */
@ -391,6 +429,16 @@ public interface WorkflowCoreService {
    @PostMapping("/api/process/task/countersign")
    Boolean countersignTask(@Validated @RequestBody BpmnTaskCountersignDTO dto);

+    /**
+     * 重置节点审批人（提级审批）
+     *
+     * @param dto
+     * @return
+     */
+    @Operation(summary = "重置节点审批人（提级审批）")
+    @PostMapping("/api/process/task/approvers/reset")
+    Boolean resetTaskApprovers(@Validated @RequestBody BpmnTaskResetApproversDTO dto);
+
    /**
     * 暂停流程任务,并创建机器人节点,等待业务推动
     *
--- a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/api/WorkflowManageService.java
+++ b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/api/WorkflowManageService.java
@ -1,68 +1,17 @@
 package cn.axzo.workflow.starter.api;

-import cn.axzo.workflow.starter.feign.ext.WorkflowEngineStarterFeignConfiguration;
-import cn.axzo.workflow.common.util.ThreadUtil;
-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.dto.print.PrintFieldDTO;
-import cn.axzo.workflow.common.model.request.bpmn.print.PrintFieldQueryDTO;
-import cn.azxo.framework.common.model.CommonResponse;
-import io.swagger.v3.oas.annotations.Operation;
-import org.springframework.validation.annotation.Validated;
-import javax.validation.constraints.NotBlank;
-import java.util.List;
-import java.util.Map;
 import cn.axzo.workflow.common.model.request.admin.ProcessAdminCreateDTO;
 import cn.axzo.workflow.common.model.request.admin.ProcessAdminDeleteDTO;
 import cn.axzo.workflow.common.model.request.admin.ProcessAdminQueryDTO;
-import cn.axzo.workflow.common.model.response.admin.ProcessAdminVo;
+import cn.axzo.workflow.common.model.request.bpmn.BpmnButtonMetaInfo;
+import cn.axzo.workflow.common.model.request.bpmn.RestBpmnProcessVariable;
 import cn.axzo.workflow.common.model.request.bpmn.activity.BpmnActivityTimeoutCallbackDTO;
 import cn.axzo.workflow.common.model.request.bpmn.activity.BpmnActivityTimeoutTriggerDTO;
-import cn.axzo.workflow.common.model.request.form.definition.StartFormSearchDTO;
-import cn.axzo.workflow.common.model.request.form.instance.FormDetailDTO;
-import cn.axzo.workflow.common.model.request.form.instance.FormSearchDTO;
-import cn.axzo.workflow.common.model.response.form.FormVO;
-import cn.axzo.workflow.common.model.response.form.definition.FormDefinitionVO;
-import cn.axzo.workflow.common.model.response.form.instance.FormInstanceVO;
-import cn.axzo.workflow.common.model.request.es.InstanceSearchReqDTO;
-import cn.axzo.workflow.common.model.response.BpmPageResult;
-import cn.axzo.workflow.common.model.response.es.ProcessInstanceDocumentVO;
-import cn.axzo.workflow.common.model.dto.SignFileDTO;
-import cn.axzo.workflow.common.model.dto.SimpleDocDTO;
-import cn.axzo.workflow.common.model.request.bpmn.process.BeforeProcessInstanceCreateDTO;
-import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceAbortDTO;
-import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceAdminPageReqVO;
-import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceCancelDTO;
-import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceCarbonCopyDTO;
-import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceCheckApproverDTO;
-import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceCreateDTO;
-import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceLogQueryDTO;
-import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceMyPageReqVO;
-import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceQueryDTO;
-import cn.axzo.workflow.common.model.request.bpmn.process.SuperBpmnProcessInstanceCancelDTO;
-import cn.axzo.workflow.common.model.request.bpmn.process.doc.ApproverReadStatusDTO;
-import cn.axzo.workflow.common.model.request.bpmn.process.doc.ChangeApproverReadStatusDTO;
-import cn.axzo.workflow.common.model.request.bpmn.process.doc.ProcessDocQueryDTO;
-import cn.axzo.workflow.common.model.request.form.instance.FormVariablesUpdateDTO;
-import cn.axzo.workflow.common.model.response.bpmn.BatchOperationResultVO;
-import cn.axzo.workflow.common.model.response.bpmn.process.BpmnProcessInstanceAdminPageItemVO;
-import cn.axzo.workflow.common.model.response.bpmn.process.BpmnProcessInstanceLogVO;
-import cn.axzo.workflow.common.model.response.bpmn.process.BpmnProcessInstancePageItemVO;
-import cn.axzo.workflow.common.model.response.bpmn.process.BpmnProcessInstanceVO;
-import cn.axzo.workflow.common.model.response.bpmn.process.NodesByModelVO;
-import cn.axzo.workflow.common.model.response.bpmn.process.ProcessNodeDetailVO;
-import cn.axzo.workflow.common.model.response.bpmn.process.doc.DocPendingVO;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import javax.annotation.Nullable;
-import javax.validation.constraints.NotNull;
-import cn.axzo.workflow.common.model.request.category.*;
-import cn.axzo.workflow.common.model.response.category.CategoryConfigItemVO;
-import cn.axzo.workflow.common.model.response.category.CategoryGroupVarItemVo;
-import cn.axzo.workflow.common.model.response.category.CategoryItemVO;
-import org.springframework.web.bind.annotation.*;
-import static cn.axzo.workflow.common.enums.RpcInvokeModeEnum.*;
-import cn.axzo.workflow.common.model.request.bpmn.BpmnButtonMetaInfo;
+import cn.axzo.workflow.common.model.request.bpmn.definition.BpmnProcessDefinitionUpdateDTO;
+import cn.axzo.workflow.common.model.request.bpmn.log.LogApproveSearchDTO;
 import cn.axzo.workflow.common.model.request.bpmn.model.BpmnModelCreateDTO;
 import cn.axzo.workflow.common.model.request.bpmn.model.BpmnModelSearchDTO;
 import cn.axzo.workflow.common.model.request.bpmn.model.BpmnModelUpdateDTO;
@ -75,21 +24,71 @@ import cn.axzo.workflow.common.model.request.bpmn.model.doc.DocSearchDTO;
 import cn.axzo.workflow.common.model.request.bpmn.model.doc.DocStatusDTO;
 import cn.axzo.workflow.common.model.request.bpmn.model.doc.DocTenantQueryDTO;
 import cn.axzo.workflow.common.model.request.bpmn.model.doc.DocUpdateDTO;
+import cn.axzo.workflow.common.model.request.bpmn.print.PrintFieldQueryDTO;
 import cn.axzo.workflow.common.model.request.bpmn.print.PrintTemplateConfigQueryDTO;
 import cn.axzo.workflow.common.model.request.bpmn.print.PrintTemplateConfigUpsertDTO;
 import cn.axzo.workflow.common.model.request.bpmn.print.RestPrintTemplateConfigDTO;
+import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessDefinitionPageDTO;
+import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceAdminPageReqVO;
+import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceCheckApproverDTO;
+import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceMyPageReqVO;
+import cn.axzo.workflow.common.model.request.bpmn.process.SuperBpmnProcessInstanceCancelDTO;
+import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskAttachmentDTO;
+import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskPageSearchDTO;
+import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskRemindDTO;
+import cn.axzo.workflow.common.model.request.category.CategoryConfigCreateDTO;
+import cn.axzo.workflow.common.model.request.category.CategoryConfigSearchDTO;
+import cn.axzo.workflow.common.model.request.category.CategoryCreateDTO;
+import cn.axzo.workflow.common.model.request.category.CategoryGroupVarSearchDto;
+import cn.axzo.workflow.common.model.request.category.CategoryGroupVarUpsertDto;
+import cn.axzo.workflow.common.model.request.category.CategorySearchDTO;
+import cn.axzo.workflow.common.model.request.category.CategoryUpdateDTO;
+import cn.axzo.workflow.common.model.request.es.InstanceSearchReqDTO;
+import cn.axzo.workflow.common.model.request.form.instance.FormSearchDTO;
+import cn.axzo.workflow.common.model.response.BpmPageResult;
+import cn.axzo.workflow.common.model.response.admin.ProcessAdminVo;
 import cn.axzo.workflow.common.model.response.bpmn.model.BpmnModelDetailVO;
 import cn.axzo.workflow.common.model.response.bpmn.model.BpmnModelExtVO;
 import cn.axzo.workflow.common.model.response.bpmn.model.doc.DocBaseVO;
-import cn.axzo.workflow.common.model.response.print.PrintModelDTO;
-import cn.axzo.workflow.common.model.request.bpmn.RestBpmnProcessVariable;
-import cn.axzo.workflow.common.model.request.bpmn.task.*;
-import cn.axzo.workflow.common.model.response.bpmn.task.*;
-import javax.validation.constraints.NotEmpty;
-import cn.axzo.workflow.common.model.request.bpmn.definition.BpmnProcessDefinitionUpdateDTO;
-import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessDefinitionPageDTO;
 import cn.axzo.workflow.common.model.response.bpmn.process.BpmnProcessDefinitionVO;
+import cn.axzo.workflow.common.model.response.bpmn.process.BpmnProcessInstanceAdminPageItemVO;
+import cn.axzo.workflow.common.model.response.bpmn.process.BpmnProcessInstancePageItemVO;
+import cn.axzo.workflow.common.model.response.bpmn.process.ExtProcessLogVO;
+import cn.axzo.workflow.common.model.response.bpmn.process.ProcessNodeDetailVO;
+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.model.response.category.CategoryConfigItemVO;
+import cn.axzo.workflow.common.model.response.category.CategoryGroupVarItemVo;
+import cn.axzo.workflow.common.model.response.category.CategoryItemVO;
+import cn.axzo.workflow.common.model.response.es.ProcessInstanceDocumentVO;
+import cn.axzo.workflow.common.model.response.form.FormVO;
+import cn.axzo.workflow.common.model.response.print.PrintModelDTO;
+import cn.axzo.workflow.common.util.ThreadUtil;
+import cn.axzo.workflow.starter.feign.ext.WorkflowEngineStarterFeignConfiguration;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import io.swagger.v3.oas.annotations.Operation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+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 javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+import java.util.Map;
+
 import static cn.axzo.workflow.common.constant.BpmnConstants.NO_TENANT_ID;
+import static cn.axzo.workflow.common.enums.RpcInvokeModeEnum.ASYNC;
+import static cn.axzo.workflow.common.enums.RpcInvokeModeEnum.SYNC;

 /**
 * Workflow Engine Starter Management Service
@ -201,25 +200,9 @@ public interface WorkflowManageService {

    @PostMapping("/api/form/admin/form/page")
    @InvokeMode(SYNC)
+    @Manageable
    List<FormVO> formPage(@Validated @RequestBody FormSearchDTO dto);

-    @PostMapping("/api/form/admin/start/form")
-    @InvokeMode(SYNC)
-    FormDefinitionVO getFormDefinition(@Validated @RequestBody StartFormSearchDTO dto);
-
-    /**
-     * 查询指定审批实例的表单模型和数据
-     * <p>
-     * dto 中的 processInstanceId 与 taskId，至少有一个属性有值，一般建议直接使用实例 ID。
-     * 当传入 taskId 时，将只查询该任务绑定的表单模型和数据。
-     *
-     * @param dto
-     * @return
-     */
-    @PostMapping("/api/form/admin/instance/render")
-    @InvokeMode(SYNC)
-    FormInstanceVO getFormInstance(@Validated @RequestBody FormDetailDTO dto);
-
    /**
     * 从 ES 中搜索符合条件的实例纬度数据
     *
@ -325,6 +308,18 @@ public interface WorkflowManageService {
    @InvokeMode(SYNC)
    Boolean checkInstanceApprover(@Validated @RequestBody BpmnProcessInstanceCheckApproverDTO dto);

+    /**
+     * 查询 ExtAxProcessLog 表中审批人的冗余信息
+     *
+     * @param dto
+     * @return
+     */
+    @Operation(summary = "查询 ExtAxProcessLog 表中审批人的冗余信息")
+    @GetMapping("/api/process/instance/log/approve/ext")
+    @Manageable
+    @InvokeMode(SYNC)
+    List<ExtProcessLogVO> getProcessLogByInstanceIdAndPersonId(@Validated @RequestBody LogApproveSearchDTO dto);
+
    /**
     * 将死信队列中的任务转移到正常 JOB 队列中
     * <p>