From 5421b8af862890dcf187c2ad5ece55423959ba85 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 23 十月 2026 19:27:14 +0800
Subject: [PATCH] feat(bpm): 全部业务审批流改回 BPM，审批统一进入协同办公
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceExceptionServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceExceptionServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceExceptionServiceImpl.java
index 8f59d69..582f822 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceExceptionServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceExceptionServiceImpl.java
@@ -7,6 +7,9 @@
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceExceptionSaveReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceExceptionDO;
import cn.iocoder.yudao.module.hrm.dal.mysql.attendance.HrmAttendanceExceptionMapper;
+import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
+import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
+import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
import cn.iocoder.yudao.module.system.api.approval.ApprovalConfigApi;
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
@@ -45,6 +48,11 @@
*/
private static final String ATTENDANCE_APPROVE_BIZ_TYPE = "hrm_attendance_approve";
+ /**
+ * 鑰冨嫟寮傚父鐢宠瀹℃壒鐨� BPM 娴佺▼瀹氫箟 Key
+ */
+ private static final String ATTENDANCE_APPROVE_PROCESS_KEY = "hrm_attendance_approve";
+
@Resource
private HrmAttendanceExceptionMapper attendanceExceptionMapper;
@Resource
@@ -53,6 +61,8 @@
private StorageAttachmentApi storageAttachmentApi;
@Resource
private ApprovalConfigApi approvalConfigApi;
+ @Resource
+ private BpmProcessInstanceApi bpmProcessInstanceApi;
@Resource
private AdminUserApi adminUserApi;
@Resource
@@ -145,6 +155,12 @@
if (attendanceExceptionMapper.submitAndResetAuditInfo(id, HrmAuditStatusEnum.PROCESS.getStatus()) != 1) {
throw exception(ATTENDANCE_EXCEPTION_SUBMIT_FAIL_NOT_EDITABLE);
}
+
+ // 5. 鍒涘缓 BPM 娴佺▼瀹炰緥锛屼娇瀹℃壒鍑虹幇鍦ㄣ�屽崗鍚屽姙鍏� - 鎴戠殑娴佺▼銆�
+ bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(ATTENDANCE_APPROVE_PROCESS_KEY)
+ .setBusinessKey(String.valueOf(id)));
}
@Override
@@ -196,6 +212,37 @@
}
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateAttendanceExceptionAuditStatus(Long id, Integer bpmStatus, String reason) {
+ // BPM 瀹℃壒缁撴灉鏄犲皠涓鸿�冨嫟寮傚父瀹℃壒鐘舵�侊細閫氳繃=20 / 涓嶉�氳繃=30 / 鍙栨秷=40
+ Integer status;
+ if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmStatus)) {
+ status = HrmAuditStatusEnum.APPROVE.getStatus();
+ } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmStatus)) {
+ status = HrmAuditStatusEnum.REJECT.getStatus();
+ } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmStatus)) {
+ status = HrmAuditStatusEnum.CANCEL.getStatus();
+ } else {
+ return;
+ }
+ HrmAttendanceExceptionDO exception = attendanceExceptionMapper.selectById(id);
+ if (attendanceExceptionMapper.updateAuditStatusByBpm(id, status, reason) != 1) {
+ log.warn("[updateAttendanceExceptionAuditStatus] 鑰冨嫟寮傚父鐢宠({}) 涓嶅浜庡鎵逛腑鐘舵�侊紝蹇界暐 BPM 缁撴灉({})", id, bpmStatus);
+ return;
+ }
+ // 瀹℃壒閫氳繃鍚庣疆涓氬姟閫昏緫锛氳ˉ鍗″洖濉笂涓嬬彮鏃堕棿 / 鍔犵彮鍥炲啓鍔犵彮鏃堕暱
+ if (status.equals(HrmAuditStatusEnum.APPROVE.getStatus()) && exception != null) {
+ if (HrmAttendanceExceptionTypeEnum.SUPPLEMENT.getType().equals(exception.getType())) {
+ log.info("[updateAttendanceExceptionAuditStatus] 琛ュ崱鐢宠({}) 瀹℃壒閫氳繃锛屽紑濮嬫洿鏂拌�冨嫟璁板綍", id);
+ attendanceRecordService.supplementClockIn(exception);
+ } else if (HrmAttendanceExceptionTypeEnum.OVERTIME.getType().equals(exception.getType())) {
+ log.info("[updateAttendanceExceptionAuditStatus] 鍔犵彮鐢宠({}) 瀹℃壒閫氳繃锛屽紑濮嬪洖鍐欏姞鐝椂闀�", id);
+ attendanceRecordService.recordOvertime(exception);
+ }
+ }
+ }
+
/**
* 鑾峰彇鐢ㄦ埛鏄电О
*
--
Gitblit v1.9.3