feat(oa): 完成审批历史页面全链路开发,含前后端接口、菜单配置
This commit is contained in:
@@ -4,6 +4,7 @@ import com.ruoyi.workflow.domain.FlowRecord;
|
||||
import com.ruoyi.workflow.domain.bo.WfTaskBo;
|
||||
import org.flowable.bpmn.model.FlowElement;
|
||||
import org.flowable.engine.runtime.ProcessInstance;
|
||||
import org.flowable.task.api.history.HistoricTaskInstance;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.util.List;
|
||||
@@ -124,4 +125,9 @@ public interface IWfTaskService {
|
||||
* @return Map包含isStartNode和isEndNode信息
|
||||
*/
|
||||
Map<String, Boolean> checkTaskNodeType(String taskId);
|
||||
|
||||
/**
|
||||
* 查询当前用户的审批历史(排除待审批状态)
|
||||
*/
|
||||
List<HistoricTaskInstance> selectHistoryTaskList();
|
||||
}
|
||||
|
||||
@@ -63,6 +63,7 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ
|
||||
|
||||
private final IWfCopyService copyService;
|
||||
|
||||
|
||||
/**
|
||||
* 完成任务
|
||||
*
|
||||
@@ -788,4 +789,21 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询当前用户的审批历史(排除待办任务)
|
||||
*/
|
||||
@Override
|
||||
public List<HistoricTaskInstance> selectHistoryTaskList() {
|
||||
// 获取当前登录用户ID
|
||||
String userId = TaskUtils.getUserId();
|
||||
|
||||
// Flowable 原生查询:当前用户 + 已完成(排除待办pending)
|
||||
return historyService.createHistoricTaskInstanceQuery()
|
||||
.taskAssignee(userId) // 审批人是当前用户
|
||||
.finished() // 已完成(排除待办)
|
||||
.orderByHistoricTaskInstanceEndTime()
|
||||
.desc() // 按完成时间倒序,最新的在最前面
|
||||
.list();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user