From a378f38df1785cbc8c9f1d55ace6a37952d2f65b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 10 八月 2026 14:01:56 +0800
Subject: [PATCH] feat(crm): 新增开票功能并完善权限查询
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmLeaveApplicationServiceImpl.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmLeaveApplicationServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmLeaveApplicationServiceImpl.java
index 55ac560..0ee5726 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmLeaveApplicationServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmLeaveApplicationServiceImpl.java
@@ -4,6 +4,7 @@
import cn.hutool.core.util.ObjUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
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.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
@@ -19,6 +20,7 @@
import cn.iocoder.yudao.module.hrm.enums.HrmLeaveTypeEnum;
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;
@@ -44,7 +46,7 @@
/**
* 璇峰亣鐢宠 Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -63,6 +65,8 @@
private BpmProcessInstanceApi bpmProcessInstanceApi;
@Resource
private BpmCategoryService bpmCategoryService;
+ @Resource
+ private StorageAttachmentApi storageAttachmentApi;
@Resource
private BpmProcessDefinitionService bpmProcessDefinitionService;
@@ -87,12 +91,14 @@
application.setDeptId(createReqVO.getDeptId() != null ? createReqVO.getDeptId() : user.getDeptId());
application.setStatus(HrmAuditStatusEnum.DRAFT.getStatus());
leaveApplicationMapper.insert(application);
+ // 缁戝畾闄勪欢
+ storageAttachmentApi.bindAttachments("file", "hrm_leave_application",
+ application.getId(), createReqVO.getBlobIds());
return application.getId();
}
private Long getCurrentUserId() {
- // TODO: 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛ID
- return 1L;
+ return SecurityFrameworkUtils.getLoginUserId();
}
private String generateUniqueNo() {
@@ -115,6 +121,7 @@
// 鏇存柊
HrmLeaveApplicationDO updateObj = BeanUtils.toBean(updateReqVO, HrmLeaveApplicationDO.class);
leaveApplicationMapper.updateById(updateObj);
+ storageAttachmentApi.updateAttachments("file", "hrm_leave_application", updateReqVO.getId(), updateReqVO.getBlobIds());
}
@Override
@@ -125,6 +132,8 @@
if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())) {
throw exception(LEAVE_APPLICATION_UPDATE_FAIL_NOT_DRAFT);
}
+ // 鍒犻櫎闄勪欢鍏宠仈
+ storageAttachmentApi.deleteAttachmentsByRecord("hrm_leave_application", id);
// 鍒犻櫎
leaveApplicationMapper.deleteById(id);
}
@@ -167,6 +176,8 @@
respVO.setLeaveTypeName(HrmLeaveTypeEnum.getNameByStatus(application.getLeaveType()));
// 濉厖瀹℃壒鐘舵�佸悕绉�
respVO.setStatusName(HrmAuditStatusEnum.getNameByStatus(application.getStatus()));
+ // 濉厖闄勪欢鍒楄〃
+ respVO.setAttachmentList(storageAttachmentApi.listAttachments("hrm_leave_application", id));
return respVO;
}
--
Gitblit v1.9.3