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/approval/HrmRegularizeApplicationServiceImpl.java | 63 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 7 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmRegularizeApplicationServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmRegularizeApplicationServiceImpl.java
index 2a90f0e..da24153 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmRegularizeApplicationServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmRegularizeApplicationServiceImpl.java
@@ -14,6 +14,9 @@
import cn.iocoder.yudao.module.hrm.dal.redis.HrmNoRedisDAO;
import cn.iocoder.yudao.module.hrm.enums.HrmAuditStatusEnum;
import cn.iocoder.yudao.module.hrm.enums.HrmEmploymentTypeEnum;
+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.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.dept.PostApi;
@@ -57,6 +60,11 @@
private static final String REGULARIZE_APPROVE_BIZ_TYPE = "hrm_regularize_approve";
/**
+ * 杞鐢宠瀹℃壒鐨� BPM 娴佺▼瀹氫箟 Key
+ */
+ private static final String REGULARIZE_APPROVE_PROCESS_KEY = "hrm_regularize_approve";
+
+ /**
* 鍛樺伐鐘舵�侊細鍦ㄨ亴
*/
private static final Integer EMPLOYEE_STATUS_ACTIVE = 1;
@@ -78,6 +86,8 @@
private AdminUserApi adminUserApi;
@Resource
private ApprovalConfigApi approvalConfigApi;
+ @Resource
+ private BpmProcessInstanceApi bpmProcessInstanceApi;
@Resource
private HrmEmployeeMapper employeeMapper;
@@ -124,7 +134,8 @@
@Override
public void updateRegularizeApplication(HrmRegularizeApplicationSaveReqVO updateReqVO) {
HrmRegularizeApplicationDO application = validateRegularizeApplicationExists(updateReqVO.getId());
- if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())) {
+ if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())
+ && !Objects.equals(application.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())) {
throw exception(REGULARIZE_APPLICATION_UPDATE_FAIL_NOT_DRAFT);
}
HrmRegularizeApplicationDO updateObj = BeanUtils.toBean(updateReqVO, HrmRegularizeApplicationDO.class);
@@ -134,7 +145,8 @@
@Override
public void deleteRegularizeApplication(Long id) {
HrmRegularizeApplicationDO application = validateRegularizeApplicationExists(id);
- if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())) {
+ if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())
+ && !Objects.equals(application.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())) {
throw exception(REGULARIZE_APPLICATION_UPDATE_FAIL_NOT_DRAFT);
}
regularizeApplicationMapper.deleteById(id);
@@ -241,7 +253,15 @@
approvalConfigApi.validateApprovalEnabledAndGetApprovers(REGULARIZE_APPROVE_BIZ_TYPE);
// 3. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋滐紝閬垮厤娈嬬暀銆屽鏍镐笉閫氳繃銆嶇殑鍘熷洜
- regularizeApplicationMapper.submitAndResetAuditInfo(id, HrmAuditStatusEnum.PROCESS.getStatus());
+ if (regularizeApplicationMapper.submitAndResetAuditInfo(id, HrmAuditStatusEnum.PROCESS.getStatus()) != 1) {
+ throw exception(REGULARIZE_APPLICATION_SUBMIT_FAIL_NOT_EDITABLE);
+ }
+
+ // 4. 鍒涘缓 BPM 娴佺▼瀹炰緥锛屼娇瀹℃壒鍑虹幇鍦ㄣ�屽崗鍚屽姙鍏� - 鎴戠殑娴佺▼銆�
+ bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(REGULARIZE_APPROVE_PROCESS_KEY)
+ .setBusinessKey(String.valueOf(id)));
}
@Override
@@ -266,13 +286,17 @@
if (StrUtil.isBlank(reviewRemark)) {
throw exception(REGULARIZE_APPLICATION_AUDIT_REJECT_REASON_REQUIRED);
}
- regularizeApplicationMapper.auditRegularizeApplication(id, HrmAuditStatusEnum.REJECT.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (regularizeApplicationMapper.auditRegularizeApplication(id, HrmAuditStatusEnum.REJECT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(REGULARIZE_APPLICATION_AUDIT_FAIL_NOT_PROCESS);
+ }
return;
}
// 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄鏍搁�氳繃
- regularizeApplicationMapper.auditRegularizeApplication(id, HrmAuditStatusEnum.APPROVE.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (regularizeApplicationMapper.auditRegularizeApplication(id, HrmAuditStatusEnum.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(REGULARIZE_APPLICATION_AUDIT_FAIL_NOT_PROCESS);
+ }
// 6. 瀹℃牳閫氳繃鍚庣疆涓氬姟閫昏緫锛氬洖鍐欏憳宸ヤ富妗ｏ紙鐘舵��=鍦ㄨ亴锛岀敤宸ユ�ц川=姝ｅ紡锛岃浆姝ｆ棩鏈� = 鎷熻浆姝ｆ棩鏈熸垨褰撳ぉ锛�
writeBackEmployee(application);
@@ -298,6 +322,31 @@
.build());
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateRegularizeApplicationAuditStatus(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;
+ }
+ HrmRegularizeApplicationDO application = regularizeApplicationMapper.selectById(id);
+ if (regularizeApplicationMapper.updateAuditStatusByBpm(id, status, reason) != 1) {
+ log.warn("[updateRegularizeApplicationAuditStatus] 杞鐢宠({}) 涓嶅浜庡鎵逛腑鐘舵�侊紝蹇界暐 BPM 缁撴灉({})", id, bpmStatus);
+ return;
+ }
+ // 瀹℃壒閫氳繃鍚庣疆涓氬姟閫昏緫锛氬洖鍐欏憳宸ヤ富妗�
+ if (status.equals(HrmAuditStatusEnum.APPROVE.getStatus()) && application != null) {
+ writeBackEmployee(application);
+ }
+ }
+
/**
* 鑾峰彇鐢ㄦ埛鏄电О
*
--
Gitblit v1.9.3