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/HrmTransferApplicationServiceImpl.java | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java
index d63e58a..2a937d6 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java
@@ -6,9 +6,11 @@
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.HrmTransferApplicationPageReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmTransferApplicationRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmTransferApplicationSaveReqVO;
@@ -19,6 +21,7 @@
import cn.iocoder.yudao.module.hrm.enums.HrmTransferTypeEnum;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.dept.PostApi;
+import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
import cn.iocoder.yudao.module.system.api.dept.dto.PostRespDTO;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
@@ -47,7 +50,7 @@
/**
* 璋冨矖鐢宠 Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -69,7 +72,11 @@
@Resource
private BpmCategoryService bpmCategoryService;
@Resource
+ private StorageAttachmentApi storageAttachmentApi;
+ @Resource
private BpmProcessDefinitionService bpmProcessDefinitionService;
+ @Resource
+ private BpmProcessInstanceService bpmProcessInstanceService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -99,6 +106,8 @@
application.setUserId(userId);
application.setStatus(HrmAuditStatusEnum.DRAFT.getStatus());
transferApplicationMapper.insert(application);
+ storageAttachmentApi.bindAttachments("file", "hrm_transfer_application",
+ application.getId(), createReqVO.getBlobIds());
return application.getId();
}
@@ -129,6 +138,7 @@
}
HrmTransferApplicationDO updateObj = BeanUtils.toBean(updateReqVO, HrmTransferApplicationDO.class);
transferApplicationMapper.updateById(updateObj);
+ storageAttachmentApi.updateAttachments("file", "hrm_transfer_application", updateReqVO.getId(), updateReqVO.getBlobIds());
}
@Override
@@ -137,6 +147,7 @@
if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())) {
throw exception(TRANSFER_APPLICATION_UPDATE_FAIL_NOT_DRAFT);
}
+ storageAttachmentApi.deleteAttachmentsByRecord("hrm_transfer_application", id);
transferApplicationMapper.deleteById(id);
}
@@ -170,6 +181,7 @@
fillPostNames(respVO, application);
respVO.setTransferTypeName(HrmTransferTypeEnum.getNameByStatus(application.getTransferType()));
respVO.setStatusName(HrmAuditStatusEnum.getNameByStatus(application.getStatus()));
+ respVO.setAttachmentList(storageAttachmentApi.listAttachments("hrm_transfer_application", id));
return respVO;
}
@@ -249,6 +261,17 @@
if (ObjUtil.notEqual(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())) {
throw exception(TRANSFER_APPLICATION_SUBMIT_FAIL_NOT_DRAFT);
}
+ // 鍏ㄥ眬鍏嶅鎵癸細涓氬姟鏍￠獙閫氳繃鍚庣洿鎺ユ墽琛屽鎵归�氳繃閫昏緫锛屾棤闇�娴佺▼妯″瀷銆�
+ if (bpmProcessInstanceApi.isGlobalAutoApprove()) {
+ transferApplicationMapper.updateById(HrmTransferApplicationDO.builder()
+ .id(id)
+ .processInstanceId("")
+ .status(HrmAuditStatusEnum.PROCESS.getStatus())
+ .build());
+ updateTransferApplicationAuditStatus(id, HrmAuditStatusEnum.APPROVE.getStatus());
+ return;
+ }
+
validateApproveCategoryAndProcessDefinition();
ProcessDefinition processDefinition = bpmProcessDefinitionService.getActiveProcessDefinition(processDefinitionKey);
if (processDefinition == null) {
@@ -283,6 +306,21 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
+ public void cancel(Long id, Long loginUserId) {
+ HrmTransferApplicationDO application = validateTransferApplicationExists(id);
+ // 浠呮湰浜恒�佷笖澶勪簬瀹℃壒涓姸鎬佸彲鎾ら攢
+ if (!Objects.equals(application.getUserId(), loginUserId)
+ || !Objects.equals(application.getStatus(), HrmAuditStatusEnum.PROCESS.getStatus())) {
+ throw exception(TRANSFER_APPLICATION_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS);
+ }
+ bpmProcessInstanceService.cancelProcessInstanceByStartUser(loginUserId,
+ new BpmProcessInstanceCancelReqVO()
+ .setId(application.getProcessInstanceId())
+ .setReason("鐢宠浜烘挙閿�璋冨矖鐢宠"));
+ }
+
+ @Override
public List<Map<String, Object>> getApproveProcessDefinitionList() {
validateApproveCategoryAndProcessDefinition();
List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
--
Gitblit v1.9.3