增加todolist接口的时间查询条件

yangys

2025-06-16 7978162cac9730d0c8e7ad9016d28c65e5da69c6

增加todolist接口的时间查询条件

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

@@ -15,9 +15,12 @@
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.flow.core.pojo.entity.BladeFlow;
import org.springblade.mdm.flow.service.FlowBusinessService;
import org.springblade.mdm.flow.vo.TaskTraceVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.Collections;
import java.util.List;
import java.util.Map;

@Slf4j
@@ -36,10 +39,15 @@
    @GetMapping("overtime-list")
    @ApiOperationSupport(order = 3)
    @Operation(summary = "超时查询", description = "查询所有超时任务")
    public R<IPage<BladeFlow>> todoList(@Parameter(description = "执行人员") String assigneeName, @Parameter(description = "关键字") String keyword, Query query) {
    public R<IPage<BladeFlow>> overtimeList(@Parameter(description = "执行人员") String assigneeName, @Parameter(description = "关键字") String keyword, Query query) {
        IPage<BladeFlow> pages = businessService.selectOvertimePage(Condition.getPage(query), assigneeName,keyword);
        return R.data(pages);
    }

    @GetMapping("process-trace")
    public R<List<TaskTraceVO>> processTrace(long processInstanceId){
        return R.data(Collections.emptyList());
    }


}

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

@@ -20,6 +20,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.time.LocalDate;
import java.util.Map;

@Slf4j
@@ -38,8 +39,8 @@
    @GetMapping("todo-list")
    @ApiOperationSupport(order = 3)
    @Operation(summary = "待办任务", description = "传入流程信息")
    public R<IPage<BladeFlow>> todoList(@Parameter(description = "关键字") String keyword, Query query) {
        IPage<BladeFlow> pages = businessService.selectTodoPage(Condition.getPage(query), keyword);
    public R<IPage<BladeFlow>> todoList(@Parameter(description = "关键字") String keyword, @Parameter(description = "创建时间开始") LocalDate createTimeBegin, @Parameter(description = "创建时间截止") LocalDate createTimeEnd, Query query) {
        IPage<BladeFlow> pages = businessService.selectTodoPage(Condition.getPage(query), createTimeBegin,createTimeEnd,keyword);
        return R.data(pages);
    }

@@ -49,7 +50,7 @@
    @GetMapping("alltask-list")
    @ApiOperationSupport(order = 3)
    @Operation(summary = "所有任务（fortest）", description = "传入流程信息")
    public R<IPage<BladeFlow>> alltaskList(@Parameter(description = "关键字") String keyword, Query query) {
    public R<IPage<BladeFlow>> alltaskList(@Parameter(description = "关键字") String keyword,LocalDate createTimeBegin,LocalDate createTimeEnd, Query query) {
        IPage<BladeFlow> pages = businessService.selectAllTaskPage(Condition.getPage(query), keyword);
        return R.data(pages);
    }

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

@@ -37,9 +37,7 @@
import org.flowable.task.api.history.HistoricTaskInstanceQuery;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringPool;
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.core.tool.utils.*;
import org.springblade.flow.core.constant.ProcessConstant;
import org.springblade.flow.core.pojo.entity.BladeFlow;
import org.springblade.flow.core.utils.TaskUtil;
@@ -48,6 +46,7 @@
import org.springblade.mdm.flow.util.MdmFlowCache;
import org.springframework.stereotype.Service;

import java.time.LocalDate;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
@@ -66,13 +65,20 @@
    private final HistoryService historyService;


    public IPage<BladeFlow> selectTodoPage(IPage<BladeFlow> page, String keyword) {
    public IPage<BladeFlow> selectTodoPage(IPage<BladeFlow> page, LocalDate createTimeBegin,LocalDate createTimeEnd, String keyword) {
        //String taskUser = TaskUtil.getTaskUser();
        String userId = ""+AuthUtil.getUserId();
        List<BladeFlow> flowList = new LinkedList<>();

        TaskQuery todoQuery = taskService.createTaskQuery().taskAssignee(userId).active().includeProcessVariables();
        if(Func.isNotEmpty(createTimeBegin)){
            todoQuery.taskCreatedAfter(DateUtil.toDate(createTimeBegin));
            //如果查询实例的开始时间：todoQuery.taskInProgressStartDueAfter()
        }
        if(Func.isNotEmpty(createTimeEnd)){
            todoQuery.taskCreatedBefore(DateUtil.toDate(createTimeEnd));

        }
        if(Func.isNotEmpty(keyword)){
            todoQuery.or();


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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
package org.springblade.mdm.flow.vo;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

import java.time.LocalDate;
import java.time.LocalDateTime;

@Data
@Schema(description = "流程轨迹数据")
public class TaskTraceVO {

    @Schema(description = "执行人")
    private String assigneeName;
    @Schema(description = "批注")
    private String comment;
    @Schema(description = "开始时间")
    private LocalDateTime startTime;
    @Schema(description = "完成时间")
    private LocalDateTime completeTime;

}