feat: 添加审批历史页面,处于办公中心下
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
package com.ruoyi.workflow.service;
|
||||
|
||||
|
||||
import com.ruoyi.workflow.domain.FlowRecord;
|
||||
import com.ruoyi.workflow.domain.bo.WfTaskBo;
|
||||
import org.flowable.bpmn.model.FlowElement;
|
||||
@@ -126,8 +127,4 @@ public interface IWfTaskService {
|
||||
*/
|
||||
Map<String, Boolean> checkTaskNodeType(String taskId);
|
||||
|
||||
/**
|
||||
* 查询当前用户的审批历史(排除待审批状态)
|
||||
*/
|
||||
List<HistoricTaskInstance> selectHistoryTaskList();
|
||||
}
|
||||
|
||||
@@ -4,6 +4,8 @@ import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.convert.Convert;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.AbstractWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.ruoyi.common.core.service.UserService;
|
||||
import com.ruoyi.common.exception.ServiceException;
|
||||
import com.ruoyi.common.helper.LoginHelper;
|
||||
@@ -790,20 +792,6 @@ 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