From 8b4105c2d327e09ce2664bbd7cf96559be2f788b Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期五, 30 十月 2026 20:13:16 +0800
Subject: [PATCH] fix(hrm): 补齐请假/离职/调岗的撤销接口，修复点击撤销报 404
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java | 62 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 1 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java
index 3548495..bac3817 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java
@@ -6,19 +6,24 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
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.controller.admin.task.vo.instance.BpmProcessInstanceCancelReqVO;
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
import cn.iocoder.yudao.module.bpm.service.definition.BpmCategoryService;
import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
+import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmResignationApplicationPageReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmResignationApplicationRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmResignationApplicationSaveReqVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmResignationHandoverReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.approval.HrmResignationApplicationDO;
import cn.iocoder.yudao.module.hrm.dal.mysql.approval.HrmResignationApplicationMapper;
import cn.iocoder.yudao.module.hrm.dal.redis.HrmNoRedisDAO;
import cn.iocoder.yudao.module.hrm.enums.HrmAuditStatusEnum;
import cn.iocoder.yudao.module.hrm.enums.HrmResignationTypeEnum;
+import cn.iocoder.yudao.module.hrm.service.handover.HrmUserHandoverService;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
+import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import jakarta.annotation.Resource;
@@ -45,7 +50,7 @@
/**
* 绂昏亴鐢宠 Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -69,7 +74,13 @@
@Resource
private BpmCategoryService bpmCategoryService;
@Resource
+ private StorageAttachmentApi storageAttachmentApi;
+ @Resource
private BpmProcessDefinitionService bpmProcessDefinitionService;
+ @Resource
+ private BpmProcessInstanceService bpmProcessInstanceService;
+ @Resource
+ private HrmUserHandoverService handoverService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -95,6 +106,8 @@
application.setStatus(HrmAuditStatusEnum.DRAFT.getStatus());
application.setHandoverStatus(HANDOVER_STATUS_NOT_STARTED);
resignationApplicationMapper.insert(application);
+ storageAttachmentApi.bindAttachments("file", "hrm_resignation_application",
+ application.getId(), createReqVO.getBlobIds());
return application.getId();
}
@@ -118,6 +131,7 @@
}
HrmResignationApplicationDO updateObj = BeanUtils.toBean(updateReqVO, HrmResignationApplicationDO.class);
resignationApplicationMapper.updateById(updateObj);
+ storageAttachmentApi.updateAttachments("file", "hrm_resignation_application", updateReqVO.getId(), updateReqVO.getBlobIds());
}
@Override
@@ -126,6 +140,7 @@
if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())) {
throw exception(RESIGNATION_APPLICATION_UPDATE_FAIL_NOT_DRAFT);
}
+ storageAttachmentApi.deleteAttachmentsByRecord("hrm_resignation_application", id);
resignationApplicationMapper.deleteById(id);
}
@@ -159,6 +174,7 @@
respVO.setResignationTypeName(HrmResignationTypeEnum.getNameByStatus(application.getResignationType()));
respVO.setHandoverStatusName(getHandoverStatusName(application.getHandoverStatus()));
respVO.setStatusName(HrmAuditStatusEnum.getNameByStatus(application.getStatus()));
+ respVO.setAttachmentList(storageAttachmentApi.listAttachments("hrm_resignation_application", id));
return respVO;
}
@@ -232,6 +248,17 @@
if (ObjUtil.notEqual(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())) {
throw exception(RESIGNATION_APPLICATION_SUBMIT_FAIL_NOT_DRAFT);
}
+ // 鍏ㄥ眬鍏嶅鎵癸細涓氬姟鏍￠獙閫氳繃鍚庣洿鎺ユ墽琛屽鎵归�氳繃閫昏緫锛屾棤闇�娴佺▼妯″瀷銆�
+ if (bpmProcessInstanceApi.isGlobalAutoApprove()) {
+ resignationApplicationMapper.updateById(HrmResignationApplicationDO.builder()
+ .id(id)
+ .processInstanceId("")
+ .status(HrmAuditStatusEnum.PROCESS.getStatus())
+ .build());
+ updateResignationApplicationAuditStatus(id, HrmAuditStatusEnum.APPROVE.getStatus());
+ return;
+ }
+
validateApproveCategoryAndProcessDefinition();
ProcessDefinition processDefinition = bpmProcessDefinitionService.getActiveProcessDefinition(processDefinitionKey);
if (processDefinition == null) {
@@ -263,6 +290,21 @@
if (!hasActiveDefinition) {
throw exception(RESIGNATION_APPLICATION_BPM_PROCESS_DEFINITION_NOT_EXISTS);
}
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void cancel(Long id, Long loginUserId) {
+ HrmResignationApplicationDO application = validateResignationApplicationExists(id);
+ // 浠呮湰浜恒�佷笖澶勪簬瀹℃壒涓姸鎬佸彲鎾ら攢
+ if (!Objects.equals(application.getUserId(), loginUserId)
+ || !Objects.equals(application.getStatus(), HrmAuditStatusEnum.PROCESS.getStatus())) {
+ throw exception(RESIGNATION_APPLICATION_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS);
+ }
+ bpmProcessInstanceService.cancelProcessInstanceByStartUser(loginUserId,
+ new BpmProcessInstanceCancelReqVO()
+ .setId(application.getProcessInstanceId())
+ .setReason("鐢宠浜烘挙閿�绂昏亴鐢宠"));
}
@Override
@@ -311,4 +353,22 @@
return resignationApplicationMapper.selectByProcessInstanceId(processInstanceId);
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateHandoverStatus(HrmResignationHandoverReqVO reqVO) {
+ HrmResignationApplicationDO application = validateResignationApplicationExists(reqVO.getId());
+ resignationApplicationMapper.updateById(HrmResignationApplicationDO.builder()
+ .id(reqVO.getId())
+ .handoverStatus(reqVO.getHandoverStatus())
+ .build());
+ // 浜ゆ帴瀹屾垚鏃讹紝鍒涘缓鐢ㄦ埛鏁版嵁浜ゆ帴鏄犲皠
+ if (Objects.equals(reqVO.getHandoverStatus(), HANDOVER_STATUS_COMPLETED)
+ && application.getHandoverUserId() != null) {
+ handoverService.createHandover(
+ application.getUserId(),
+ application.getHandoverUserId(),
+ application.getId());
+ }
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3