分页调整

yangys

2025-07-23 0fc62b8fb995c51966bacf343da2c5dcff350568

分页调整

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

@@ -7,6 +7,7 @@
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.TaskService;
import org.flowable.task.api.Task;
import org.springblade.core.secure.utils.AuthUtil;
@@ -42,7 +43,7 @@
    private final StartDispatcher dispatcher;

    private final TaskService taskService;

    private final RuntimeService runtimeService;
    private final ProcessProgRefService processProgRefService;

    private ApproveRecordService approveRecordService;
@@ -71,6 +72,7 @@
        String programIds = null;
        if(variables.containsKey("programIds")){
            programIds = variables.get("programIds").toString();
            runtimeService.setVariable(taskId, "programIds", programIds);
        }
        if(StringUtils.isNotEmpty(programIds)) {
            processProgRefService.addRelations(processInstanceId,Func.toLongList(programIds));

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

@@ -107,8 +107,8 @@
    @GetMapping("search-list")
    @ApiOperationSupport(order = 3)
    @Operation(summary = "流程查询", description = "查询进行中的所有流程")
    public R<IPage<FlowVO>> searchList(@Parameter(description = "任务到达时间开始") LocalDate createTimeBegin, @Parameter(description = "任务到达时间截止")LocalDate createTimeEnd, @Parameter(description = "关键字") String keyword, Query query) {
        IPage<FlowVO> pages = businessService.selectSearchPage(Condition.getPage(query), createTimeBegin,createTimeEnd,keyword);
    public R<IPage<FlowVO>> searchList(@Parameter(description = "流程类型")String processDefinitionKey,@Parameter(description = "任务到达时间开始") LocalDate createTimeBegin, @Parameter(description = "任务到达时间截止")LocalDate createTimeEnd, @Parameter(description = "关键字") String keyword, Query query) {
        IPage<FlowVO> pages = businessService.selectSearchPage(Condition.getPage(query), createTimeBegin,createTimeEnd,processDefinitionKey,keyword);
        return R.data(pages);
    }


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

@@ -51,10 +51,10 @@

    /**
     * 查询我的流程(个人待办列表)
     * @param page
     * @param createTimeBegin
     * @param createTimeEnd
     * @param keyword
     * @param page 分页信息
     * @param createTimeBegin 创建时间开始
     * @param createTimeEnd 创建时间截止
     * @param keyword 查询关键字
     * @return
     */
    public IPage<FlowVO> selectTodoPage(IPage<FlowVO> page, LocalDateTime createTimeBegin, LocalDateTime createTimeEnd, String keyword) {
@@ -81,7 +81,7 @@

        // 构建列表数据
        FlowVO bladeFlow = new FlowVO();
        buildFlowTaskList(bladeFlow, flowList, todoQuery);
        buildFlowTaskList(bladeFlow, flowList, todoQuery,page.getCurrent(),page.getSize());
        flowList.forEach(flowVO -> {
            if(flowVO.getVariables().containsKey("machineCode")){
                //Machine machinemachineService.getByCode((String)flowVO.getVariables().get("machineCode"))
@@ -89,8 +89,7 @@
        });
        // 计算总数
        long count = todoQuery.count();
        // 设置页数
        //page.setSize(count);

        // 设置总数
        page.setTotal(count);
        // 设置数据
@@ -259,7 +258,7 @@
     * @param flowList  流程列表
     * @param taskQuery 任务查询类
     */
    private void buildFlowTaskList(FlowVO bladeFlow, List<FlowVO> flowList, TaskQuery taskQuery) {
    private void buildFlowTaskList(FlowVO bladeFlow, List<FlowVO> flowList, TaskQuery taskQuery,Long currentPage,Long pageSize) {
        if (bladeFlow.getCategory() != null) {
            taskQuery.processCategoryIn(Func.toStrList(bladeFlow.getCategory()));
        }
@@ -273,7 +272,10 @@
            taskQuery.taskCreatedBefore(bladeFlow.getEndDate());
        }

        List<Task> tasks = taskQuery.list();
        //List<Task> tasks = taskQuery.list();
        long total = taskQuery.count();
        Long firstResult = (currentPage-1)*pageSize+1;
        List<Task> tasks = taskQuery.listPage(Func.toInt(firstResult), Func.toInt(pageSize));
        tasks.forEach(task -> {
            FlowVO flow = new FlowVO();
            flow.setTaskId(task.getId());
@@ -372,7 +374,7 @@

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

        // 计算总数
        long count = todoQuery.count();
@@ -413,12 +415,11 @@

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

        // 计算总数
        long count = todoQuery.count();
        // 设置页数
        page.setSize(count);

        // 设置总数
        page.setTotal(count);
        // 设置数据
@@ -434,7 +435,7 @@
     * @param keyword
     * @return
     */
    public IPage<FlowVO> selectSearchPage(IPage<FlowVO> page, LocalDate createTimeBegin, LocalDate createTimeEnd, String keyword) {
    public IPage<FlowVO> selectSearchPage(IPage<FlowVO> page, LocalDate createTimeBegin, LocalDate createTimeEnd,String processDefinitionKey,String keyword) {

        List<FlowVO> flowList = new LinkedList<>();
        Date now = new Date();
@@ -445,6 +446,9 @@
        if(Func.isNotEmpty(createTimeEnd)) {
            taskQuery.taskCreatedBefore(DateUtil.toDate(createTimeEnd.plusDays(1)));
        }
        if(Func.isNotEmpty(processDefinitionKey)) {
            taskQuery.processDefinitionKey(processDefinitionKey);
        }

        addKeywordCondition(taskQuery, keyword);

@@ -452,12 +456,10 @@

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

        // 计算总数
        long count = taskQuery.count();
        // 设置页数
        page.setSize(count);
        // 设置总数
        page.setTotal(count);
        // 设置数据