From 8115244d0fd95971a2e2c880c6a4c7dfd4269be2 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 5 Jan 2026 09:56:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(flow):=20=E6=B7=BB=E5=8A=A0=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E7=B1=BB=E5=9E=8B=E5=92=8C=E4=B8=9A=E5=8A=A1ID?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=88=B0=E6=B5=81=E7=A8=8B=E5=8A=A8=E4=BD=9C?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在HrmFlowAction实体中新增bizType和bizId字段 - 修改saveAction方法签名以接收业务类型和业务ID参数 - 更新审批、盖章、拒绝、撤回、转办等操作的调用以传递业务类型和业务ID - 在动作记录中保存业务类型和业务ID信息到数据库 --- .../java/com/klp/hrm/domain/HrmFlowAction.java | 2 ++ .../service/impl/HrmFlowTaskServiceImpl.java | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/klp-hrm/src/main/java/com/klp/hrm/domain/HrmFlowAction.java b/klp-hrm/src/main/java/com/klp/hrm/domain/HrmFlowAction.java index 700cf199..bdf31b45 100644 --- a/klp-hrm/src/main/java/com/klp/hrm/domain/HrmFlowAction.java +++ b/klp-hrm/src/main/java/com/klp/hrm/domain/HrmFlowAction.java @@ -22,6 +22,8 @@ public class HrmFlowAction extends BaseEntity implements Serializable { private String action; private String remark; private Long actionUserId; + private String bizType; + private Long bizId; @TableLogic private Integer delFlag; } diff --git a/klp-hrm/src/main/java/com/klp/hrm/service/impl/HrmFlowTaskServiceImpl.java b/klp-hrm/src/main/java/com/klp/hrm/service/impl/HrmFlowTaskServiceImpl.java index e50577b5..261d0f0a 100644 --- a/klp-hrm/src/main/java/com/klp/hrm/service/impl/HrmFlowTaskServiceImpl.java +++ b/klp-hrm/src/main/java/com/klp/hrm/service/impl/HrmFlowTaskServiceImpl.java @@ -145,9 +145,9 @@ public class HrmFlowTaskServiceImpl implements IHrmFlowTaskService { // 无模板一次性审批（tplId=0 或 nodeId=0）：直接结束流程 if (inst.getTplId() != null && inst.getTplId() == 0L) { // 记录动作 - saveAction(taskId, inst.getInstId(), "approve", remark, actionUserId); + saveAction(taskId, inst.getInstId(), "approve", remark, actionUserId,task.getBizType(), task.getBizId()); if (stampBo != null) { - saveAction(taskId, inst.getInstId(), "stamp", "盖章", actionUserId); + saveAction(taskId, inst.getInstId(), "stamp", "盖章", actionUserId,task.getBizType(), task.getBizId()); } task.setStatus("approved"); baseMapper.updateById(task); @@ -159,7 +159,7 @@ public class HrmFlowTaskServiceImpl implements IHrmFlowTaskService { sealReqService.updateStatus(inst.getBizId(), "approved"); if (stampBo != null) { // 盖章动作也写入流转历史 - saveAction(taskId, inst.getInstId(), "stamp", "盖章", actionUserId); + saveAction(taskId, inst.getInstId(), "stamp", "盖章", actionUserId,task.getBizType(), task.getBizId()); sealReqService.stampWithJava(inst.getBizId(), stampBo); } } @@ -172,7 +172,7 @@ public class HrmFlowTaskServiceImpl implements IHrmFlowTaskService { return false; } // 记录动作 - saveAction(taskId, inst.getInstId(), "approve", remark, actionUserId); + saveAction(taskId, inst.getInstId(), "approve", remark, actionUserId,task.getBizType(),task.getBizId()); // 完成当前任务 task.setStatus("approved"); baseMapper.updateById(task); @@ -254,7 +254,7 @@ public class HrmFlowTaskServiceImpl implements IHrmFlowTaskService { if (inst == null) { return false; } - saveAction(taskId, inst.getInstId(), "reject", remark, actionUserId); + saveAction(taskId, inst.getInstId(), "reject", remark, actionUserId,task.getBizType(),task.getBizId()); task.setStatus("rejected"); baseMapper.updateById(task); inst.setStatus("rejected"); @@ -278,7 +278,7 @@ public class HrmFlowTaskServiceImpl implements IHrmFlowTaskService { if (inst == null) { return false; } - saveAction(taskId, inst.getInstId(), "withdraw", remark, actionUserId); + saveAction(taskId, inst.getInstId(), "withdraw", remark, actionUserId, task.getBizType(), task.getBizId()); task.setStatus("withdraw"); baseMapper.updateById(task); // 无模板一次性审批：撤回后业务回到 pending，并重新生成一个待办（仍然只允许一次审批） @@ -313,7 +313,7 @@ public class HrmFlowTaskServiceImpl implements IHrmFlowTaskService { return true; } - private void saveAction(Long taskId, Long instId, String action, String remark, Long userId) { + private void saveAction(Long taskId, Long instId, String action, String remark, Long userId, String bizType, Long bizId) { HrmFlowAction log = new HrmFlowAction(); log.setTaskId(taskId); log.setInstId(instId); @@ -321,6 +321,8 @@ public class HrmFlowTaskServiceImpl implements IHrmFlowTaskService { log.setRemark(remark); log.setActionUserId(userId); log.setCreateTime(new Date()); + log.setBizType(bizType); + log.setBizId(bizId); actionMapper.insert(log); } @@ -339,7 +341,7 @@ public class HrmFlowTaskServiceImpl implements IHrmFlowTaskService { return false; } // 记录动作 - saveAction(taskId, inst.getInstId(), "transfer", remark, actionUserId); + saveAction(taskId, inst.getInstId(), "transfer", remark, actionUserId, task.getBizType(), task.getBizId()); // 更新办理人 HrmFlowTask u = new HrmFlowTask(); From b93776d7f869854aff5f51a8149035b2d85c05ad Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 5 Jan 2026 11:06:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(flow):=20=E6=B7=BB=E5=8A=A0=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E7=B1=BB=E5=9E=8B=E5=92=8CID=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=98=A0=E5=B0=84=E5=B9=B6=E5=A2=9E=E5=8A=A0=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=B0=83=E8=AF=95=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在HrmFlowTask实体中添加TableField注解映射biz_type和biz_id字段 - 在流程任务服务实现中添加业务类型和ID的打印调试信息 - 在创建下一个任务时设置业务类型和ID字段值 - 修复流程处理中的业务数据传递问题 --- klp-hrm/src/main/java/com/klp/hrm/domain/HrmFlowTask.java | 3 +++ .../java/com/klp/hrm/service/impl/HrmFlowTaskServiceImpl.java | 2 ++ 2 files changed, 5 insertions(+) diff --git a/klp-hrm/src/main/java/com/klp/hrm/domain/HrmFlowTask.java b/klp-hrm/src/main/java/com/klp/hrm/domain/HrmFlowTask.java index 6faa5a04..45fd8840 100644 --- a/klp-hrm/src/main/java/com/klp/hrm/domain/HrmFlowTask.java +++ b/klp-hrm/src/main/java/com/klp/hrm/domain/HrmFlowTask.java @@ -1,5 +1,6 @@ package com.klp.hrm.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; @@ -26,9 +27,11 @@ public class HrmFlowTask extends BaseEntity implements Serializable { private String remark; /** 业务类型：leave/travel/seal */ + @TableField("biz_type") private String bizType; /** 业务ID：对应请假/出差/用印的 bizId */ + @TableField("biz_id") private Long bizId; @TableLogic diff --git a/klp-hrm/src/main/java/com/klp/hrm/service/impl/HrmFlowTaskServiceImpl.java b/klp-hrm/src/main/java/com/klp/hrm/service/impl/HrmFlowTaskServiceImpl.java index 261d0f0a..37eefdf8 100644 --- a/klp-hrm/src/main/java/com/klp/hrm/service/impl/HrmFlowTaskServiceImpl.java +++ b/klp-hrm/src/main/java/com/klp/hrm/service/impl/HrmFlowTaskServiceImpl.java @@ -225,6 +225,8 @@ public class HrmFlowTaskServiceImpl implements IHrmFlowTaskService { nextTask.setInstId(inst.getInstId()); nextTask.setNodeId(next.getNodeId()); nextTask.setAssigneeUserId(assignees.get(0)); + nextTask.setBizType(inst.getBizType()); + nextTask.setBizId(inst.getBizId()); nextTask.setStatus("pending"); baseMapper.insert(nextTask); } else {