From 1cbc592d8b674b63a6e2117d7c48ab4ff8cb867e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 20:29:07 +0800
Subject: [PATCH] fix(hrm): 考勤异常申请字段匹配与申请人回填；补充 hrm_audit_status 字典脚本
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceExceptionServiceImpl.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 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 89cfe32..08474c4 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
@@ -8,7 +8,12 @@
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceExceptionPageReqVO;
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.dataobject.employee.HrmEmployeeDO;
import cn.iocoder.yudao.module.hrm.dal.mysql.attendance.HrmAttendanceExceptionMapper;
+import cn.iocoder.yudao.module.hrm.service.employee.HrmEmployeeService;
+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 cn.iocoder.yudao.module.hrm.dal.redis.HrmNoRedisDAO;
import cn.iocoder.yudao.module.hrm.enums.HrmAuditStatusEnum;
import jakarta.annotation.Resource;
@@ -25,7 +30,7 @@
/**
* 鑰冨嫟寮傚父鐢宠 Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -35,9 +40,15 @@
@Resource
private HrmAttendanceExceptionMapper attendanceExceptionMapper;
@Resource
+ private HrmEmployeeService employeeService;
+ @Resource
+ private AdminUserApi adminUserApi;
+ @Resource
private HrmNoRedisDAO noRedisDAO;
@Resource
private BpmProcessInstanceApi bpmProcessInstanceApi;
+ @Resource
+ private StorageAttachmentApi storageAttachmentApi;
@Resource
private BpmProcessDefinitionService bpmProcessDefinitionService;
@@ -45,8 +56,22 @@
public Long createAttendanceException(HrmAttendanceExceptionSaveReqVO createReqVO) {
HrmAttendanceExceptionDO attendanceException = BeanUtils.toBean(createReqVO, HrmAttendanceExceptionDO.class);
attendanceException.setNo(generateNo());
+ // 鐢宠浜洪粯璁や负褰撳墠鐧诲綍鐢ㄦ埛瀵瑰簲鐨勫憳宸ワ紝鍓嶇琛ㄥ崟涓嶉�夋嫨鐢宠浜�
+ Long loginUserId = cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId();
+ HrmEmployeeDO employee = employeeService.getEmployeeByUserId(loginUserId);
+ if (employee == null) {
+ AdminUserRespDTO loginUser = adminUserApi.getUser(loginUserId);
+ throw exception(ATTENDANCE_EXCEPTION_EMPLOYEE_NOT_EXISTS,
+ loginUser != null ? loginUser.getNickname() : String.valueOf(loginUserId));
+ }
+ attendanceException.setUserId(employee.getId());
+ if (attendanceException.getDeptId() == null) {
+ attendanceException.setDeptId(employee.getDeptId());
+ }
attendanceException.setStatus(HrmAuditStatusEnum.DRAFT.getStatus());
attendanceExceptionMapper.insert(attendanceException);
+ storageAttachmentApi.bindAttachments("file", "hrm_attendance_exception",
+ attendanceException.getId(), createReqVO.getBlobIds());
return attendanceException.getId();
}
@@ -59,11 +84,13 @@
validateAttendanceExceptionExists(updateReqVO.getId());
HrmAttendanceExceptionDO updateObj = BeanUtils.toBean(updateReqVO, HrmAttendanceExceptionDO.class);
attendanceExceptionMapper.updateById(updateObj);
+ storageAttachmentApi.updateAttachments("file", "hrm_attendance_exception", updateReqVO.getId(), updateReqVO.getBlobIds());
}
@Override
public void deleteAttendanceException(Long id) {
validateAttendanceExceptionExists(id);
+ storageAttachmentApi.deleteAttachmentsByRecord("hrm_attendance_exception", id);
attendanceExceptionMapper.deleteById(id);
}
--
Gitblit v1.9.3