From 51abfca40fb3f94a6ae881c6c102074baf9b49c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cwuzhen=E2=80=9D?= Date: Mon, 9 Nov 2026 13:20:34 +0800 Subject: [PATCH] =?UTF-8?q?feat(workflow):=20=E5=BE=85=E5=8A=9E=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=B1=95=E7=A4=BA=E8=AF=B7=E5=81=87=E5=92=8C=E9=94=80?= =?UTF-8?q?=E5=81=87=E7=9A=84=E7=8F=AD=E7=BA=A7=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 审批人在我的待办里可以直接看到学生班级,不必再打开单据。 Co-authored-by: Cursor --- .../workflow/domain/vo/FlowTaskVo.java | 5 + .../workflow/service/FlowTaskEnricher.java | 19 ++++ .../service/impl/FlwTaskServiceImpl.java | 5 + .../xg/workflow/XgLeaveFlowTaskEnricher.java | 106 ++++++++++++++++++ docs/开发文档/warm-flow工作流框架开发指南.md | 2 + mobile/src/pages/task/taskWaiting.vue | 4 + web/src/api/workflow/task/types.ts | 2 + web/src/views/workflow/task/taskWaiting.vue | 1 + 8 files changed, 144 insertions(+) create mode 100644 backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/FlowTaskEnricher.java create mode 100644 backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/workflow/XgLeaveFlowTaskEnricher.java diff --git a/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java b/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java index 07a22c4f..8ea09f5c 100644 --- a/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java +++ b/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java @@ -174,6 +174,11 @@ public class FlowTaskVo implements Serializable { @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "createBy") private String createByName; + /** + * 班级名称。仅请假、销假等待办由业务模块回填,其他流程保持 null。 + */ + private String className; + /** * 是否为申请人节点 */ diff --git a/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/FlowTaskEnricher.java b/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/FlowTaskEnricher.java new file mode 100644 index 00000000..7afcde2c --- /dev/null +++ b/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/FlowTaskEnricher.java @@ -0,0 +1,19 @@ +package org.dromara.workflow.service; + +import org.dromara.workflow.domain.vo.FlowTaskVo; + +import java.util.List; + +/** + * 运行中待办的业务字段回填。工作流模块只定义扩展点,具体业务在各自模块实现。 + */ +public interface FlowTaskEnricher { + + /** + * 为一页待办补业务展示字段。未识别的任务保持原值。 + * + * @param tasks 当前页待办 + */ + void enrich(List tasks); + +} diff --git a/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java b/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java index 3d0676af..e486701c 100644 --- a/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java +++ b/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java @@ -47,6 +47,7 @@ import org.dromara.workflow.domain.vo.FlowHisTaskVo; import org.dromara.workflow.domain.vo.FlowTaskVo; import org.dromara.workflow.mapper.FlwCategoryMapper; import org.dromara.workflow.mapper.FlwTaskMapper; +import org.dromara.workflow.service.FlowTaskEnricher; import org.dromara.workflow.service.IFlwCommonService; import org.dromara.workflow.service.IFlwNodeExtService; import org.dromara.workflow.service.IFlwTaskAssigneeService; @@ -88,6 +89,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService { private final IFlwCommonService flwCommonService; private final IFlwNodeExtService flwNodeExtService; private final FlwHisTaskExtMapper flwHisTaskExtMapper; + private final List flowTaskEnrichers; /** * 启动任务 @@ -345,6 +347,9 @@ public class FlwTaskServiceImpl implements IFlwTaskService { t.setAssigneeNames(StreamUtils.join(userList, UserDTO::getNickName)); } }); + if (CollUtil.isNotEmpty(flowTaskEnrichers)) { + flowTaskEnrichers.forEach(enricher -> enricher.enrich(records)); + } } return page; } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/workflow/XgLeaveFlowTaskEnricher.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/workflow/XgLeaveFlowTaskEnricher.java new file mode 100644 index 00000000..f19c5ae1 --- /dev/null +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/workflow/XgLeaveFlowTaskEnricher.java @@ -0,0 +1,106 @@ +package org.dromara.xg.workflow; + +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.workflow.common.ConditionalOnEnable; +import org.dromara.workflow.domain.vo.FlowTaskVo; +import org.dromara.workflow.service.FlowTaskEnricher; +import org.dromara.xg.domain.XgStudentCancelLeave; +import org.dromara.xg.domain.XgStudentLeave; +import org.dromara.xg.mapper.XgStudentCancelLeaveMapper; +import org.dromara.xg.mapper.XgStudentLeaveMapper; +import org.springframework.stereotype.Component; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** + * 为请假、销假待办回填班级名称。 + */ +@ConditionalOnEnable +@Component +@RequiredArgsConstructor +public class XgLeaveFlowTaskEnricher implements FlowTaskEnricher { + + private static final String LEAVE_FLOW_PREFIX = "hzdyjs-qj"; + private static final String CANCEL_FLOW_PREFIX = "hzdyjs-xj"; + + private final XgStudentLeaveMapper leaveMapper; + private final XgStudentCancelLeaveMapper cancelLeaveMapper; + + @Override + public void enrich(List tasks) { + if (CollUtil.isEmpty(tasks)) { + return; + } + List leaveIds = distinctBusinessIds(tasks, LEAVE_FLOW_PREFIX); + List cancelIds = distinctBusinessIds(tasks, CANCEL_FLOW_PREFIX); + Map leaveClassNames = loadLeaveClassNames(leaveIds); + Map cancelClassNames = loadCancelClassNames(cancelIds); + for (FlowTaskVo task : tasks) { + String flowCode = task.getFlowCode(); + Long businessId = parseBusinessId(task.getBusinessId()); + if (businessId == null || StringUtils.isBlank(flowCode)) { + continue; + } + if (flowCode.startsWith(LEAVE_FLOW_PREFIX) && leaveClassNames.containsKey(businessId)) { + task.setClassName(leaveClassNames.get(businessId)); + } else if (flowCode.startsWith(CANCEL_FLOW_PREFIX) && cancelClassNames.containsKey(businessId)) { + task.setClassName(cancelClassNames.get(businessId)); + } + } + } + + private List distinctBusinessIds(List tasks, String flowPrefix) { + return tasks.stream() + .filter(task -> StringUtils.isNotBlank(task.getFlowCode()) && task.getFlowCode().startsWith(flowPrefix)) + .map(task -> parseBusinessId(task.getBusinessId())) + .filter(Objects::nonNull) + .distinct() + .toList(); + } + + private Map loadLeaveClassNames(List ids) { + if (CollUtil.isEmpty(ids)) { + return Map.of(); + } + List rows = leaveMapper.selectList(Wrappers.lambdaQuery() + .select(XgStudentLeave::getId, XgStudentLeave::getClassName) + .in(XgStudentLeave::getId, ids)); + Map classNames = new HashMap<>(); + for (XgStudentLeave row : rows) { + classNames.put(row.getId(), StringUtils.blankToDefault(row.getClassName(), "")); + } + return classNames; + } + + private Map loadCancelClassNames(List ids) { + if (CollUtil.isEmpty(ids)) { + return Map.of(); + } + List rows = cancelLeaveMapper.selectList(Wrappers.lambdaQuery() + .select(XgStudentCancelLeave::getId, XgStudentCancelLeave::getClassName) + .in(XgStudentCancelLeave::getId, ids)); + Map classNames = new HashMap<>(); + for (XgStudentCancelLeave row : rows) { + classNames.put(row.getId(), StringUtils.blankToDefault(row.getClassName(), "")); + } + return classNames; + } + + private Long parseBusinessId(String businessId) { + if (StringUtils.isBlank(businessId)) { + return null; + } + try { + return Long.valueOf(businessId.trim()); + } catch (NumberFormatException ex) { + return null; + } + } + +} diff --git a/docs/开发文档/warm-flow工作流框架开发指南.md b/docs/开发文档/warm-flow工作流框架开发指南.md index 77ca4ce0..23f9c0a2 100644 --- a/docs/开发文档/warm-flow工作流框架开发指南.md +++ b/docs/开发文档/warm-flow工作流框架开发指南.md @@ -164,6 +164,8 @@ public interface IFlwTaskService { } ``` +运行中待办(`pageByTaskWait`、`pageByAllTaskWait`)可返回 `className`。该字段由学工模块按请假(`hzdyjs-qj*`)、销假(`hzdyjs-xj*`)业务单回填,其他流程保持空。 + ### 3.2 前端核心组件 #### 3.2.1 审批按钮组件 (approvalButton.vue) diff --git a/mobile/src/pages/task/taskWaiting.vue b/mobile/src/pages/task/taskWaiting.vue index abcda617..d03e65f6 100644 --- a/mobile/src/pages/task/taskWaiting.vue +++ b/mobile/src/pages/task/taskWaiting.vue @@ -106,6 +106,10 @@ 申请人: {{ item.createByName || '-' }} + + 班级: + {{ item.className || '-' }} + 办理人: diff --git a/web/src/api/workflow/task/types.ts b/web/src/api/workflow/task/types.ts index 8698effa..68c8720c 100644 --- a/web/src/api/workflow/task/types.ts +++ b/web/src/api/workflow/task/types.ts @@ -31,6 +31,8 @@ export interface FlowTaskVO { version?: string; applyNode?: boolean; buttonList?: buttonList[]; + /** 班级名称,仅请假、销假待办由后端回填 */ + className?: string; } export interface buttonList { diff --git a/web/src/views/workflow/task/taskWaiting.vue b/web/src/views/workflow/task/taskWaiting.vue index 31feb902..d35b9001 100644 --- a/web/src/views/workflow/task/taskWaiting.vue +++ b/web/src/views/workflow/task/taskWaiting.vue @@ -41,6 +41,7 @@ +