diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/controller/HrmFlowTaskController.java b/fad-hrm/src/main/java/com/ruoyi/hrm/controller/HrmFlowTaskController.java index b7aaf50..07c299a 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/controller/HrmFlowTaskController.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/controller/HrmFlowTaskController.java @@ -6,6 +6,7 @@ import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.hrm.domain.bo.HrmFlowTaskBo; import com.ruoyi.hrm.domain.bo.HrmFlowTaskApproveBo; import com.ruoyi.hrm.domain.bo.HrmSealStampBo; @@ -112,4 +113,14 @@ public class HrmFlowTaskController extends BaseController { @RequestParam(required = false) String remark) { return toAjax(service.transfer(taskId, newAssigneeUserId, actionUserId, remark)); } + /** + * 审批历史列表：查询当前用户的审批历史，包含分页 + */ + @GetMapping("/historyList") + public TableDataInfo historyList(PageQuery pageQuery) { + // 使用若依自带的 LoginHelper 获取当前登录用户的 ID (类型是 Long) + Long userId = LoginHelper.getUserId(); + // 调用 Service + return service.selectHistoryTaskList(userId, pageQuery); + } } diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/service/IHrmFlowTaskService.java b/fad-hrm/src/main/java/com/ruoyi/hrm/service/IHrmFlowTaskService.java index 514d360..d2c5f60 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/service/IHrmFlowTaskService.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/service/IHrmFlowTaskService.java @@ -2,6 +2,7 @@ package com.ruoyi.hrm.service; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.hrm.domain.HrmFlowTask; import com.ruoyi.hrm.domain.bo.HrmFlowTaskBo; import com.ruoyi.hrm.domain.vo.HrmFlowTaskVo; @@ -42,6 +43,10 @@ public interface IHrmFlowTaskService { */ Boolean transfer(Long taskId, Long newAssigneeUserId, Long actionUserId, String remark); + /** + * 查询当前用户的审批历史，并回填业务数据 + */ + TableDataInfo selectHistoryTaskList(Long userId, PageQuery pageQuery); /** * 根据业务类型 + 业务ID 查询当前待办任务（pending），用于详情页自动带出 currentTaskId */ diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmFlowTaskServiceImpl.java b/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmFlowTaskServiceImpl.java index 3a09cd8..73a5ce4 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmFlowTaskServiceImpl.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmFlowTaskServiceImpl.java @@ -38,6 +38,7 @@ public class HrmFlowTaskServiceImpl implements IHrmFlowTaskService { private final FlowAssigneeHelper assigneeHelper; private final BizStatusSyncHelper bizStatusSyncHelper; + private final HrmFlowTaskMapper hrmFlowTaskMapper; // 注入五个业务Mapper private final HrmLeaveReqMapper leaveReqMapper; private final HrmTravelReqMapper travelReqMapper; @@ -397,4 +398,27 @@ public class HrmFlowTaskServiceImpl implements IHrmFlowTaskService { lqw.orderByDesc(HrmFlowTask::getCreateTime); return lqw; } + /** + * 查询当前用户的审批历史，回填业务数据以便前端复用页面 + */ + @Override + public TableDataInfo selectHistoryTaskList(Long userId, PageQuery pageQuery) { + + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + + lqw.eq(HrmFlowTask::getAssigneeUserId, userId); + + lqw.ne(HrmFlowTask::getStatus, "pending"); + + lqw.orderByDesc(HrmFlowTask::getCreateTime); + + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + + if (result.getRecords() != null && !result.getRecords().isEmpty()) { + fillBizData(result.getRecords()); + } + + return TableDataInfo.build(result); + } + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfTaskController.java index c42b0b7..c1ab077 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfTaskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfTaskController.java @@ -174,12 +174,4 @@ public class WfTaskController { } } } - /** - * 审批历史列表 - */ - @SaCheckPermission("workflow:task:historyList") - @GetMapping("/historyList") - public R historyList() { - return R.ok(flowTaskService.selectHistoryTaskList()); - } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/IWfTaskService.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/IWfTaskService.java index f2e0f2d..b94014a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/IWfTaskService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/IWfTaskService.java @@ -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 checkTaskNodeType(String taskId); - /** - * 查询当前用户的审批历史（排除待审批状态） - */ - List selectHistoryTaskList(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfTaskServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfTaskServiceImpl.java index b4a0e63..56083b0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfTaskServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfTaskServiceImpl.java @@ -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 selectHistoryTaskList() { - // 获取当前登录用户ID - String userId = TaskUtils.getUserId(); - // Flowable 原生查询：当前用户 + 已完成（排除待办pending） - return historyService.createHistoricTaskInstanceQuery() - .taskAssignee(userId) // 审批人是当前用户 - .finished() // 已完成（排除待办） - .orderByHistoricTaskInstanceEndTime() - .desc() // 按完成时间倒序，最新的在最前面 - .list(); - } + } diff --git a/ruoyi-ui/src/api/hrm/flow.js b/ruoyi-ui/src/api/hrm/flow.js index 9fda8de..a266cc3 100644 --- a/ruoyi-ui/src/api/hrm/flow.js +++ b/ruoyi-ui/src/api/hrm/flow.js @@ -238,6 +238,13 @@ export function delFlowInstance (instId) { method: 'delete' }) } +export function listHistoryFlowTask(query) { + return request({ + url: '/hrm/flow/task/historyList', + method: 'get', + params: query + }) +} /** * 查询实例对应的所有审批任务 @@ -247,4 +254,9 @@ export function listAssignTask (instId) { url: `/hrm/flow/instance/tasks/${instId}`, method: 'get' }) + +/** + * 查询当前用户的审批历史 + */ + } diff --git a/ruoyi-ui/src/store/modules/permission.js b/ruoyi-ui/src/store/modules/permission.js index 45f3259..766d105 100644 --- a/ruoyi-ui/src/store/modules/permission.js +++ b/ruoyi-ui/src/store/modules/permission.js @@ -29,34 +29,29 @@ const permission = { }, }, actions: { - // 生成路由 - GenerateRoutes({ commit }) { + GenerateRoutes({ commit }) { return new Promise(resolve => { - // 向后端请求路由数据 + getRouters().then(res => { - // ================= 新增拦截代码：将页面注入到办公中心开始 ================= - // 寻找后端传来的“办公中心”节点（根据路径或标题匹配） + const oaMenu = res.data.find(item => item.path === '/oa' || (item.meta && item.meta.title === '办公中心')); if (oaMenu) { if (!oaMenu.children) oaMenu.children = []; - // 防重判断，避免代码热更新时重复添加导致菜单重复 + const hasHistory = oaMenu.children.some(child => child.path === 'flowHistory'); if (!hasHistory) { oaMenu.children.push({ - name: 'FlowHistory', - path: 'flowHistory', // 浏览器地址后缀，点击后地址变为 /oa/flowHistory - hidden: false, // 确保在左侧菜单显示 - // 【特别注意】：这里对应的是你存放 vue 文件的真实相对路径 - // 根据你最初的代码，我推测在 hrm/flow 文件夹下。 - // 如果你的文件名叫 taskHistory.vue，请把下面的 flowHistory 改成 taskHistory - component: 'hrm/flow/flowHistory', + name: 'HrmFlowHistory', + path: 'flowHistory', + hidden: false, + component: 'hrm/flow/taskHistory', meta: { title: '审批历史', - icon: 'date-range', // 菜单图标，支持 element 图标 + icon: 'date-range', noCache: false } }); diff --git a/ruoyi-ui/src/views/hrm/flow/taskHistory.vue b/ruoyi-ui/src/views/hrm/flow/taskHistory.vue index 5492357..05db498 100644 --- a/ruoyi-ui/src/views/hrm/flow/taskHistory.vue +++ b/ruoyi-ui/src/views/hrm/flow/taskHistory.vue @@ -108,8 +108,7 @@