历史流程查询

yangys

2025-08-10 1fffb97916064ef5348a9b2ca0b0e8e4e5b89325

历史流程查询

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowMgrController.java

@@ -38,6 +38,7 @@
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -143,7 +144,7 @@
    @GetMapping("finished-list")
    @ApiOperationSupport(order = 3)
    @Operation(summary = "历史流程查询", description = "查询已完结的所有流程")
    public R<IPage<FlowVO>> finishedList(@Parameter(description = "流程类型")String processDefinitionKey,@Parameter(description = "任务到达时间开始") LocalDate createTimeBegin, @Parameter(description = "任务到达时间截止")LocalDate createTimeEnd, @Parameter(description = "关键字") String keyword, Query query) {
    public R<IPage<FlowVO>> finishedList(@Parameter(description = "流程类型")String processDefinitionKey, @Parameter(description = "任务到达时间开始") LocalDateTime createTimeBegin, @Parameter(description = "任务到达时间截止") LocalDateTime createTimeEnd, @Parameter(description = "关键字") String keyword, Query query) {
        IPage<FlowVO> pages = businessService.selectFinishedPage(Condition.getPage(query), processDefinitionKey,createTimeBegin,createTimeEnd,keyword);
        return R.data(pages);
    }

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java

@@ -46,6 +46,9 @@
    @Operation(summary = "待办任务", description = "传入流程信息")
    public R<IPage<FlowVO>> todoList(@Parameter(description = "关键字") String keyword, @Parameter(description = "创建时间开始") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime createTimeBegin, @Parameter(description = "创建时间截止")  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime createTimeEnd, Query query) {
        IPage<FlowVO> pages = businessService.selectTodoPage(Condition.getPage(query), createTimeBegin,createTimeEnd,keyword);

            //pages = businessService.selectFinishedPage(Condition.getPage(query), "",createTimeBegin, createTimeEnd, keyword);

        return R.data(pages);
    }

@@ -64,15 +67,6 @@
    @PostMapping("transferTask")
    public R<Void> transferTask(String taskId,String newAssigneeId, String processInstanceId, String comment) {
        // 增加评论
        /*
        if (StringUtil.isNoneBlank(processInstanceId, comment)) {
            taskService.addComment(taskId, processInstanceId, comment);
        }

        // 完成任务
        taskService.setAssignee(taskId, newAssigneeId);

         */
        try {
            this.flowTransferService.transferTask(taskId, newAssigneeId, comment);
            return R.success("流程转派成功");

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java

@@ -10,8 +10,10 @@
import org.flowable.engine.history.HistoricProcessInstanceQuery;
import org.flowable.engine.task.Comment;
import org.flowable.task.api.Task;
import org.flowable.task.api.TaskInfoQuery;
import org.flowable.task.api.TaskQuery;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.flowable.task.api.history.HistoricTaskInstanceQuery;
import org.springblade.core.launch.constant.FlowConstant;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
@@ -30,10 +32,7 @@

import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Collections;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
import java.util.*;

/**
 * 流程业务实现类
@@ -91,8 +90,9 @@
        page.setRecords(flowList);
        return page;
    }

    void addKeywordCondition(TaskQuery todoQuery,String keyword) {
    //TaskInfoQuery
    //void addKeywordCondition(TaskQuery todoQuery,String keyword) {
    void addKeywordCondition(TaskInfoQuery todoQuery, String keyword) {
        if(Func.isNotEmpty(keyword)) {
            String likeVal = "%" + keyword + "%";
            todoQuery.or();
@@ -478,8 +478,8 @@
     * @param keyword 关键字
     * @return
     */
    public IPage<FlowVO> selectFinishedPage(IPage<FlowVO> page, String processDefinitionKey,LocalDate createTimeBegin, LocalDate createTimeEnd, String keyword) {
        HistoricProcessInstanceQuery query = this.historyService.createHistoricProcessInstanceQuery().includeProcessVariables();
    public IPage<FlowVO> selectFinishedPage(IPage<FlowVO> page, String processDefinitionKey,LocalDateTime createTimeBegin, LocalDateTime createTimeEnd, String keyword) {
        HistoricProcessInstanceQuery query = this.historyService.createHistoricProcessInstanceQuery().finished().includeProcessVariables();
            //.finished() // 只查询已完成的流程.unfinished() // 查询未完成的流程
        if(Func.isNotEmpty(processDefinitionKey)) {
            query.processDefinitionKey(processDefinitionKey);
@@ -528,4 +528,103 @@

        return result;
    }

    /**
     * 查询已办任务分页数据
     * @param page
     * @param createTimeBegin
     * @param createTimeEnd
     * @param keyword
     * @return
     */
    /*
    public IPage<FlowVO> selectDonePage(IPage<FlowVO> page, LocalDateTime createTimeBegin, LocalDateTime createTimeEnd, String keyword) {
        String userId = "" + AuthUtil.getUserId();
        List<FlowVO> flowList = new LinkedList<>();

        HistoricTaskInstanceQuery doneTaskQuery = historyService.createHistoricTaskInstanceQuery().taskAssignee(userId).finished().includeProcessVariables();
        //TaskQuery todoQuery =  historyService.createHistoricTaskInstanceQuery().taskAssignee(userId).finished().includeProcessVariables()
        if (Func.isNotEmpty(createTimeBegin)) {
            doneTaskQuery.taskCreatedAfter(DateUtil.toDate(createTimeBegin));
        }
        if (Func.isNotEmpty(createTimeEnd)) {
            doneTaskQuery.taskCreatedBefore(DateUtil.toDate(createTimeEnd));
            //todoQuery.taskInProgressStartTimeBefore(DateUtil.toDate(createTimeEnd));
        }
        if (Func.isNotEmpty(keyword)) {
            addKeywordCondition(doneTaskQuery, keyword);
        }

        todoQuery.orderByTaskCreateTime().desc();

        // 构建列表数据
        FlowVO bladeFlow = new FlowVO();
        buildFlowTaskList(bladeFlow, flowList, todoQuery,page.getCurrent(),page.getSize());

        // 计算总数
        long count = todoQuery.count();

        // 设置总数
        page.setTotal(count);
        // 设置数据
        page.setRecords(flowList);
        return page;
    }*/
    public IPage<FlowVO> selectDonePage(IPage<FlowVO> page, String processDefinitionKey,LocalDateTime completeTimeBegin, LocalDateTime createTimeEnd, String keyword) {
        String userId = "" + AuthUtil.getUserId();
        HistoricTaskInstanceQuery doneTaskQuery = historyService.createHistoricTaskInstanceQuery().taskAssignee(userId).finished().includeProcessVariables();

        //.finished() // 只查询已完成的流程.unfinished() // 查询未完成的流程
        if(Func.isNotEmpty(processDefinitionKey)) {
            doneTaskQuery.processDefinitionKey(processDefinitionKey);
        }
        if(completeTimeBegin!=null) {
            doneTaskQuery.taskCompletedAfter(DateUtil.toDate(completeTimeBegin));
        }
        if(createTimeEnd!=null) {
            doneTaskQuery.taskCompletedBefore(DateUtil.toDate(createTimeEnd));
        }
        //QueryProperty
        doneTaskQuery.orderByTaskCreateTime().desc(); // 按结束时间降序排列
        page.setTotal(doneTaskQuery.count());

        long firstResult = (page.getCurrent()-1) * page.getSize();

        List<HistoricTaskInstance> processes = doneTaskQuery
            .listPage((int)firstResult, (int)page.getSize());

        List<FlowVO> records = new LinkedList<>();
        Map<String,String> processDefKeyMap = new HashMap<>();

        for(HistoricTaskInstance hisTask : processes) {
            FlowVO vo = new FlowVO();
            HistoricProcessInstance processInstance = historyService
                .createHistoricProcessInstanceQuery()
                .processInstanceId(hisTask.getProcessInstanceId())
                .singleResult();
            vo.setProcessDefinitionKey(processInstance.getProcessDefinitionKey());
            vo.setProcessInstanceId(hisTask.getProcessInstanceId());
            //vo.setProcessDefinitionName(processInstance.getProcessDefinitionName());


            vo.setVariables(hisTask.getProcessVariables());

            //vo.setTaskDefinitionKey();
            //hisTask.getCreateTime()
            Date processStartTime = historyService.createHistoricProcessInstanceQuery()
                .processInstanceId(hisTask.getProcessInstanceId())
                .singleResult()
                .getStartTime();

            vo.setProcessCreateTime(processStartTime);
            vo.setHistoryTaskEndTime(hisTask.getEndTime());

            vo.setFile(getFileString(hisTask.getProcessInstanceId()));
            records.add(vo);
        }

        page.setRecords(records);

        return page;
    }
}