发布

tz-framework/tz-spring-boot-starter-web/target/classes/META-INF/spring-configuration-metadata.json

@@ -132,18 +132,6 @@
       "description": "API 前缀，实现所有 Controller 提供的 RESTFul API 的统一前缀 意义：通过该前缀，避免 Swagger、Actuator 意外通过 Nginx 暴露出来给外部，带来安全性问题 这样，Nginx 只需要配置转发到 \/api\/* 的所有接口即可。 @see TzWebAutoConfiguration#configurePathMatch(PathMatchConfigurer)",
       "sourceType": "cn.start.tz.framework.web.config.WebProperties$Api"
     },
-    {
-      "name": "tz.web.appapi.controller",
-      "type": "java.lang.String",
-      "description": "Controller 所在包的 Ant 路径规则 主要目的是，给该 Controller 设置指定的 {@link #prefix}",
-      "sourceType": "cn.start.tz.framework.web.config.WebProperties$Api"
-    },
-    {
-      "name": "tz.web.appapi.prefix",
-      "type": "java.lang.String",
-      "description": "API 前缀，实现所有 Controller 提供的 RESTFul API 的统一前缀 意义：通过该前缀，避免 Swagger、Actuator 意外通过 Nginx 暴露出来给外部，带来安全性问题 这样，Nginx 只需要配置转发到 \/api\/* 的所有接口即可。 @see TzWebAutoConfiguration#configurePathMatch(PathMatchConfigurer)",
-      "sourceType": "cn.start.tz.framework.web.config.WebProperties$Api"
-    },
     {
       "name": "tz.web.external-api.controller",
       "type": "java.lang.String",

tz-module-bpm/tz-module-bpm-api/src/main/java/cn/start/tz/module/bpm/api/task/BpmProcessInstanceApi.java

@@ -2,10 +2,7 @@ package cn.start.tz.module.bpm.api.task;
 
 import cn.hutool.cron.task.Task;
 import cn.start.tz.framework.common.pojo.CommonResult;
-import cn.start.tz.module.bpm.api.task.dto.ActivateProcessInstanceDTO;
-import cn.start.tz.module.bpm.api.task.dto.BpmProcessInstanceCancelDTO;
-import cn.start.tz.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
-import cn.start.tz.module.bpm.api.task.dto.BpmTaskRejectDTO;
+import cn.start.tz.module.bpm.api.task.dto.*;
 import cn.start.tz.module.bpm.enums.ApiConstants;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -43,4 +40,8 @@ public interface BpmProcessInstanceApi {
     @PostMapping(PREFIX + "/getTaskList")
     @Operation(summary = "获取流程节点信息")
     CommonResult<List<String>> getTaskList(@Valid @RequestBody BpmProcessInstanceCreateReqDTO reqDTO);
+
+    @PostMapping(PREFIX + "/getProcessInstanceList")
+    @Operation(summary = "根据userId获取流程实例的任务列表")
+    CommonResult<List<BpmProcessInstanceRespDTO>> getProcessInstanceList(@RequestParam("userId") String userId, @Valid @RequestBody BpmProcessInstanceDTO pageReqVO);
 }

tz-module-bpm/tz-module-bpm-api/src/main/java/cn/start/tz/module/bpm/api/task/dto/BpmProcessInstanceDTO.java

@@ -0,0 +1,38 @@
+package cn.start.tz.module.bpm.api.task.dto;
+
+import cn.start.tz.framework.common.pojo.PageParam;
+import cn.start.tz.framework.common.validation.InEnum;
+import cn.start.tz.module.bpm.enums.task.BpmProcessInstanceStatusEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.start.tz.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 流程实例分页 Request VO")
+@Data
+public class BpmProcessInstanceDTO extends PageParam {
+
+    @Schema(description = "流程名称", example = "芋道")
+    private String name;
+
+    @Schema(description = "流程定义的标识", example = "2048")
+    private String processDefinitionKey; // 精准匹配
+
+    @Schema(description = "流程实例的状态", example = "1")
+    @InEnum(BpmProcessInstanceStatusEnum.class)
+    private Integer status;
+
+    @Schema(description = "流程分类", example = "1")
+    private String category;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "发起用户编号", example = "1024")
+    private Long startUserId; // 注意，只有在【流程实例】菜单，才使用该参数
+
+}

tz-module-bpm/tz-module-bpm-api/src/main/java/cn/start/tz/module/bpm/api/task/dto/BpmProcessInstanceRespDTO.java

@@ -0,0 +1,72 @@
+package cn.start.tz.module.bpm.api.task.dto;
+
+import cn.start.tz.framework.common.core.KeyValue;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+@Schema(description = "管理后台 - 流程实例的 Response VO")
+@Data
+public class BpmProcessInstanceRespDTO {
+
+    @Schema(description = "流程实例的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private String id;
+
+    @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    private String name;
+
+    @Schema(description = "流程摘要")
+    private List<KeyValue<String, String>> summary; // 只有流程表单，才有摘要！
+
+    @Schema(description = "流程分类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    private String category;
+    @Schema(description = "流程分类名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "请假")
+    private String categoryName;
+
+    @Schema(description = "流程实例的状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    private Integer status; // 参见 BpmProcessInstanceStatusEnum 枚举
+
+    @Schema(description = "发起时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    private LocalDateTime startTime;
+
+    @Schema(description = "结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    private LocalDateTime endTime;
+
+    @Schema(description = "持续时间", example = "1000")
+    private Long durationInMillis;
+
+    @Schema(description = "提交的表单值", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Map<String, Object> formVariables;
+
+    @Schema(description = "业务的唯一标识-例如说，请假申请的编号", example = "1")
+    private String businessKey;
+
+    @Schema(description = "流程定义的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")
+    private String processDefinitionId;
+
+    /**
+     * 流程标识
+     */
+    private String processDefinitionKey;
+
+    /**
+     * 当前审批中的任务
+     */
+    private List<Task> tasks; // 仅在流程实例分页才返回
+
+    @Schema(description = "流程任务")
+    @Data
+    public static class Task {
+
+        @Schema(description = "流程任务的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+        private String id;
+
+        @Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+        private String name;
+
+    }
+
+}

tz-module-bpm/tz-module-bpm-api/src/main/java/cn/start/tz/module/bpm/enums/BpmModelConstants.java

@@ -2,10 +2,19 @@ package cn.start.tz.module.bpm.enums;
 
 public interface BpmModelConstants {
 
+    /**
+     * 承压业务审核
+     */
     String ACCEPT_ORDER="ACCEPT_ORDER";
 
+    /**
+     * 上报市局审批
+     */
     String REPORT_CITY_BUREAU = "REPORT_CITY_BUREAU";
 
+    /**
+     * 任务单审核
+     */
     String TASK_ORDER = "TASK_ORDER";
 
     /**
@@ -28,6 +37,9 @@ public interface BpmModelConstants {
      */
     String PRESSURE_WORKING_INSTRUCTION= "pressure_working_instruction";
 
+    /**
+     * 模版审核
+     */
     String PRESSURE_REPORT_TEMPLATE= "report_template";
 
     /**

tz-module-bpm/tz-module-bpm-api/src/main/java/cn/start/tz/module/bpm/enums/task/BpmModeConstantsEnum.java

@@ -0,0 +1,38 @@
+package cn.start.tz.module.bpm.enums.task;
+
+import cn.hutool.core.util.StrUtil;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 流程任务的 Comment 评论类型枚举
+ *
+ * @author kehaiyou
+ */
+@Getter
+@AllArgsConstructor
+public enum BpmModeConstantsEnum {
+
+    ACCEPT_ORDER("ACCEPT_ORDER", "承压业务审核(受理单)"),
+    REPORT_CITY_BUREAU("REPORT_CITY_BUREAU", "上报市局审批"),
+    TASK_ORDER("TASK_ORDER", "任务单审核"),
+    PRESSURE_INSPECTION_OPINION_NOTICE("pressure_inspection_opinion_notice", "检验意见通知书审核"),
+    PRESSURE_SERIOUS_ACCIDENT("pressure_serious_accident", "重大事故审核"),
+    PRESSURE_INSPECTION_SCHEME("pressure_inspection_scheme", "检验方案"),
+    PRESSURE_WORKING_INSTRUCTION("pressure_working_instruction", "作业指导书"),
+    REPORT_TEMPLATE("report_template", "模版审核"),
+    PRESSURE_NON_TAX("non_tax", "非税缴费"),
+    ;
+
+    /**
+     * 审批流标识
+     *
+     * 由于 BPM Comment 类型为 String，所以这里就不使用 Integer
+     */
+    private final String type;
+    /**
+     * 操作名字
+     */
+    private final String name;
+
+}

tz-module-bpm/tz-module-bpm-biz/src/main/java/cn/start/tz/module/bpm/api/task/BpmProcessInstanceApiImpl.java

@@ -3,24 +3,39 @@ package cn.start.tz.module.bpm.api.task;
 import cn.hutool.core.collection.CollUtil;
 import cn.start.tz.framework.common.pojo.CommonResult;
 import cn.start.tz.framework.common.util.collection.CollectionUtils;
-import cn.start.tz.module.bpm.api.task.dto.ActivateProcessInstanceDTO;
-import cn.start.tz.module.bpm.api.task.dto.BpmProcessInstanceCancelDTO;
-import cn.start.tz.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
+import cn.start.tz.framework.common.util.object.PageUtils;
+import cn.start.tz.module.bpm.api.task.dto.*;
 import cn.start.tz.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceCancelReqVO;
+import cn.start.tz.module.bpm.controller.admin.task.vo.instance.BpmProcessInstancePageReqVO;
+import cn.start.tz.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceRespVO;
+import cn.start.tz.module.bpm.convert.task.BpmProcessInstanceConvert;
+import cn.start.tz.module.bpm.dal.dataobject.definition.BpmCategoryDO;
+import cn.start.tz.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
+import cn.start.tz.module.bpm.enums.task.BpmModeConstantsEnum;
+import cn.start.tz.module.bpm.framework.flowable.core.enums.BpmnVariableConstants;
+import cn.start.tz.module.bpm.framework.flowable.core.util.FlowableUtils;
 import cn.start.tz.module.bpm.service.task.BpmProcessInstanceService;
 import org.flowable.bpmn.model.Task;
 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.RuntimeService;
+import org.flowable.engine.history.HistoricProcessInstance;
+import org.flowable.engine.history.HistoricProcessInstanceQuery;
+import org.flowable.engine.repository.ProcessDefinition;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;
 
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 import static cn.start.tz.framework.common.pojo.CommonResult.success;
+import static cn.start.tz.framework.common.util.collection.CollectionUtils.convertList;
+import static cn.start.tz.framework.common.util.collection.CollectionUtils.convertSet;
 import static cn.start.tz.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
 
 /**
@@ -82,4 +97,9 @@ public class BpmProcessInstanceApiImpl implements BpmProcessInstanceApi {
         }
         return success(taskList.stream().map(Task::getId).toList());
     }
+
+    @Override
+    public CommonResult<List<BpmProcessInstanceRespDTO>> getProcessInstanceList(String userId, BpmProcessInstanceDTO pageReqVO) {
+        return success(processInstanceService.getProcessInstanceList(userId, pageReqVO));
+    }
 }

tz-module-bpm/tz-module-bpm-biz/src/main/java/cn/start/tz/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceRespVO.java

@@ -58,6 +58,11 @@ public class BpmProcessInstanceRespVO {
      */
     private BpmProcessDefinitionRespVO processDefinition;
 
+    /**
+     * 流程标识
+     */
+    private String processDefinitionKey;
+
     /**
      * 当前审批中的任务
      */

tz-module-bpm/tz-module-bpm-biz/src/main/java/cn/start/tz/module/bpm/convert/task/BpmProcessInstanceConvert.java

@@ -269,4 +269,34 @@ public interface BpmProcessInstanceConvert {
                 .setActivityNodes(activityNodes);
     }
 
+    default List<BpmProcessInstanceRespVO> buildProcessInstanceList(List<HistoricProcessInstance> processInstanceList,
+                                                                          Map<String, ProcessDefinition> processDefinitionMap,
+                                                                          Map<String, BpmCategoryDO> categoryMap,
+                                                                          Map<String, List<Task>> taskMap,
+                                                                          Map<String, AdminUserRespDTO> userMap,
+                                                                          Map<String, DeptRespDTO> deptMap,
+                                                                          Map<String, BpmProcessDefinitionInfoDO> processDefinitionInfoMap) {
+        List<BpmProcessInstanceRespVO> vpPageResult = BeanUtils.toBean(processInstanceList, BpmProcessInstanceRespVO.class);
+        for (int i = 0; i < processInstanceList.size(); i++) {
+            BpmProcessInstanceRespVO respVO = vpPageResult.get(i);
+            respVO.setStatus(FlowableUtils.getProcessInstanceStatus(processInstanceList.get(i)));
+            MapUtils.findAndThen(processDefinitionMap, respVO.getProcessDefinitionId(),
+                    processDefinition -> respVO.setCategory(processDefinition.getCategory())
+                            .setProcessDefinition(BeanUtils.toBean(processDefinition, BpmProcessDefinitionRespVO.class)));
+            MapUtils.findAndThen(categoryMap, respVO.getCategory(), category -> respVO.setCategoryName(category.getName()));
+            respVO.setTasks(BeanUtils.toBean(taskMap.get(respVO.getId()), BpmProcessInstanceRespVO.Task.class));
+            // user
+            if (userMap != null) {
+                AdminUserRespDTO startUser = userMap.get(processInstanceList.get(i).getStartUserId());
+                if (startUser != null) {
+                    respVO.setStartUser(BeanUtils.toBean(startUser, UserSimpleBaseVO.class));
+                    MapUtils.findAndThen(deptMap, startUser.getDeptId(), dept -> respVO.getStartUser().setDeptName(dept.getName()));
+                }
+            }
+            // 摘要
+            respVO.setSummary(FlowableUtils.getSummary(processDefinitionInfoMap.get(respVO.getProcessDefinitionId()),
+                    processInstanceList.get(i).getProcessVariables()));
+        }
+        return vpPageResult;
+    }
 }

tz-module-bpm/tz-module-bpm-biz/src/main/java/cn/start/tz/module/bpm/service/pressure/taskorder/BpmPressureInspectionSchemeListener.java

@@ -28,7 +28,7 @@ public class BpmPressureInspectionSchemeListener extends BpmProcessInstanceStatu
     @Override
     protected void onEvent(BpmProcessInstanceStatusEvent event) {
         log.info("任务单审核,id:{},status:{},reason:{}",event.getBusinessKey(),event.getStatus(),event.getReason());
-        taskOrderApi.auditInitiateApproval(event.getBusinessKey(), event.getStatus(),event.getReason());
+        taskOrderApi.auditInspectionPlan(event.getBusinessKey(), event.getStatus(),event.getReason());
     }
 
 

tz-module-bpm/tz-module-bpm-biz/src/main/java/cn/start/tz/module/bpm/service/task/BpmProcessInstanceService.java

@@ -2,6 +2,8 @@ package cn.start.tz.module.bpm.service.task;
 
 import cn.start.tz.framework.common.pojo.PageResult;
 import cn.start.tz.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
+import cn.start.tz.module.bpm.api.task.dto.BpmProcessInstanceDTO;
+import cn.start.tz.module.bpm.api.task.dto.BpmProcessInstanceRespDTO;
 import cn.start.tz.module.bpm.controller.admin.task.vo.instance.*;
 import jakarta.validation.Valid;
 import org.flowable.bpmn.model.Task;
@@ -164,4 +166,12 @@ public interface BpmProcessInstanceService {
      * @return
      */
     List<Task> getTaskList(BpmProcessInstanceCreateReqDTO createReqDTO);
+
+    /**
+     * 获取代办任务
+     * @param userId
+     * @param pageReqVO
+     * @return
+     */
+    List<BpmProcessInstanceRespDTO> getProcessInstanceList(String userId, BpmProcessInstanceDTO pageReqVO);
 }

tz-module-bpm/tz-module-bpm-biz/src/main/java/cn/start/tz/module/bpm/service/task/BpmProcessInstanceServiceImpl.java

@@ -14,21 +14,22 @@ import cn.start.tz.framework.common.util.object.BeanUtils;
 import cn.start.tz.framework.common.util.object.ObjectUtils;
 import cn.start.tz.framework.common.util.object.PageUtils;
 import cn.start.tz.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
+import cn.start.tz.module.bpm.api.task.dto.BpmProcessInstanceDTO;
+import cn.start.tz.module.bpm.api.task.dto.BpmProcessInstanceRespDTO;
+import cn.start.tz.module.bpm.api.task.dto.BpmTaskRespDTO;
 import cn.start.tz.module.bpm.controller.admin.definition.vo.model.BpmModelMetaInfoVO;
 import cn.start.tz.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO;
 import cn.start.tz.module.bpm.controller.admin.task.vo.instance.*;
 import cn.start.tz.module.bpm.controller.admin.task.vo.instance.BpmApprovalDetailRespVO.ActivityNodeTask;
 import cn.start.tz.module.bpm.controller.admin.task.vo.task.BpmTaskRespVO;
 import cn.start.tz.module.bpm.convert.task.BpmProcessInstanceConvert;
+import cn.start.tz.module.bpm.dal.dataobject.definition.BpmCategoryDO;
 import cn.start.tz.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
 import cn.start.tz.module.bpm.dal.redis.BpmProcessIdRedisDAO;
 import cn.start.tz.module.bpm.enums.ErrorCodeConstants;
 import cn.start.tz.module.bpm.enums.definition.BpmModelTypeEnum;
 import cn.start.tz.module.bpm.enums.definition.BpmSimpleModelNodeTypeEnum;
-import cn.start.tz.module.bpm.enums.task.BpmCommentTypeEnum;
-import cn.start.tz.module.bpm.enums.task.BpmProcessInstanceStatusEnum;
-import cn.start.tz.module.bpm.enums.task.BpmReasonEnum;
-import cn.start.tz.module.bpm.enums.task.BpmTaskStatusEnum;
+import cn.start.tz.module.bpm.enums.task.*;
 import cn.start.tz.module.bpm.framework.flowable.core.candidate.BpmTaskCandidateInvoker;
 import cn.start.tz.module.bpm.framework.flowable.core.candidate.strategy.dept.BpmTaskCandidateStartUserSelectStrategy;
 import cn.start.tz.module.bpm.framework.flowable.core.enums.BpmnModelConstants;
@@ -37,6 +38,7 @@ import cn.start.tz.module.bpm.framework.flowable.core.event.BpmProcessInstanceEv
 import cn.start.tz.module.bpm.framework.flowable.core.util.BpmnModelUtils;
 import cn.start.tz.module.bpm.framework.flowable.core.util.FlowableUtils;
 import cn.start.tz.module.bpm.framework.flowable.core.util.SimpleModelUtils;
+import cn.start.tz.module.bpm.service.definition.BpmCategoryService;
 import cn.start.tz.module.bpm.service.definition.BpmProcessDefinitionService;
 import cn.start.tz.module.bpm.service.message.BpmMessageService;
 import cn.start.tz.module.system.api.dept.DeptApi;
@@ -46,6 +48,7 @@ import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.flowable.bpmn.constants.BpmnXMLConstants;
 import org.flowable.bpmn.model.*;
 import org.flowable.engine.HistoryService;
@@ -64,8 +67,10 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static cn.start.tz.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.start.tz.framework.common.pojo.CommonResult.success;
 import static cn.start.tz.framework.common.util.collection.CollectionUtils.*;
 import static cn.start.tz.module.bpm.controller.admin.task.vo.instance.BpmApprovalDetailRespVO.ActivityNode;
 import static cn.start.tz.module.bpm.enums.ErrorCodeConstants.*;
@@ -123,9 +128,11 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
 
     @Resource
     private BpmProcessIdRedisDAO processIdRedisDAO;
-
     // ========== Query 查询相关方法 ==========
 
+    @Resource
+    private BpmCategoryService categoryService;
+
     @Override
     public ProcessInstance getProcessInstance(String id) {
         return runtimeService.createProcessInstanceQuery()
@@ -783,4 +790,40 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
         BpmnModel bpmnModel = processDefinitionService.getProcessDefinitionBpmnModel(definition.getId());
         return BpmTaskCandidateStartUserSelectStrategy.getStartUserSelectTaskList(bpmnModel);
     }
+
+    @Override
+    public List<BpmProcessInstanceRespDTO> getProcessInstanceList(String userId, BpmProcessInstanceDTO pageReqVO) {
+        pageReqVO.setPageSize(9999);
+        // 通过 BpmProcessInstanceExtDO 表，先查询到对应的分页
+        HistoricProcessInstanceQuery processInstanceQuery = historyService.createHistoricProcessInstanceQuery()
+                .includeProcessVariables()
+                .processInstanceTenantId(FlowableUtils.getTenantId())
+                .orderByProcessInstanceStartTime().desc();
+        if (userId != null) {
+            processInstanceQuery.startedBy(String.valueOf(userId));
+        }
+        processInstanceQuery.variableValueEquals(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS, pageReqVO.getStatus());
+        if (StringUtils.isNotEmpty(pageReqVO.getProcessDefinitionKey())) {
+            processInstanceQuery.processDefinitionKey(pageReqVO.getProcessDefinitionKey());
+        }
+        // 查询数量
+        long processInstanceCount = processInstanceQuery.count();
+        if (processInstanceCount == 0) {
+            return new ArrayList<>();
+        }
+        // 查询列表
+        List<HistoricProcessInstance> processInstanceList = processInstanceQuery.listPage(PageUtils.getStart(pageReqVO), pageReqVO.getPageSize());
+        // 拼接返回
+        Map<String, List<org.flowable.task.api.Task>> taskMap = bpmTaskService.getTaskMapByProcessInstanceIds(
+                convertList(processInstanceList, HistoricProcessInstance::getId));
+        Map<String, ProcessDefinition> processDefinitionMap = processDefinitionService.getProcessDefinitionMap(
+                convertSet(processInstanceList, HistoricProcessInstance::getProcessDefinitionId));
+        Map<String, BpmCategoryDO> categoryMap = categoryService.getCategoryMap(
+                convertSet(processDefinitionMap.values(), ProcessDefinition::getCategory));
+        Map<String, BpmProcessDefinitionInfoDO> processDefinitionInfoMap = processDefinitionService.getProcessDefinitionInfoMap(
+                convertSet(processInstanceList, HistoricProcessInstance::getProcessDefinitionId));
+        //组装完整数据
+        List<BpmProcessInstanceRespVO> bpmProcessInstanceRespVOS = BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceList(processInstanceList, processDefinitionMap, categoryMap, taskMap, null, null, processDefinitionInfoMap);
+        return BeanUtils.toBean(bpmProcessInstanceRespVOS, BpmProcessInstanceRespDTO.class);
+    }
 }