From d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 16:29:53 +0800
Subject: [PATCH] feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceExceptionServiceImpl.java | 195 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 161 insertions(+), 34 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..582f822 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
@@ -1,52 +1,89 @@
package cn.iocoder.yudao.module.hrm.service.attendance;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
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.service.definition.BpmProcessDefinitionService;
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.mysql.attendance.HrmAttendanceExceptionMapper;
+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.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.HrmAttendanceExceptionTypeEnum;
import cn.iocoder.yudao.module.hrm.enums.HrmAuditStatusEnum;
+import cn.iocoder.yudao.module.hrm.dal.dataobject.employee.HrmEmployeeDO;
+import cn.iocoder.yudao.module.hrm.service.employee.HrmEmployeeService;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
-import java.time.LocalDateTime;
+import java.util.Set;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static cn.iocoder.yudao.module.hrm.enums.ErrorCodeConstants.*;
/**
* 鑰冨嫟寮傚父鐢宠 Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@Slf4j
public class HrmAttendanceExceptionServiceImpl implements HrmAttendanceExceptionService {
+ /**
+ * 鑰冨嫟寮傚父鐢宠瀹℃壒鐨勪笟鍔＄被鍨嬬紪鐮�
+ *
+ * 涓� system_approval_config.biz_type 瀵瑰簲锛屽鎵逛汉鍦ㄣ�岀郴缁熺鐞� - 瀹℃壒閰嶇疆銆嶄腑缁存姢銆�
+ */
+ private static final String ATTENDANCE_APPROVE_BIZ_TYPE = "hrm_attendance_approve";
+
+ /**
+ * 鑰冨嫟寮傚父鐢宠瀹℃壒鐨� BPM 娴佺▼瀹氫箟 Key
+ */
+ private static final String ATTENDANCE_APPROVE_PROCESS_KEY = "hrm_attendance_approve";
+
@Resource
private HrmAttendanceExceptionMapper attendanceExceptionMapper;
@Resource
private HrmNoRedisDAO noRedisDAO;
@Resource
+ private StorageAttachmentApi storageAttachmentApi;
+ @Resource
+ private ApprovalConfigApi approvalConfigApi;
+ @Resource
private BpmProcessInstanceApi bpmProcessInstanceApi;
@Resource
- private BpmProcessDefinitionService bpmProcessDefinitionService;
+ private AdminUserApi adminUserApi;
+ @Resource
+ private HrmEmployeeService employeeService;
+ @Resource
+ private HrmAttendanceRecordService attendanceRecordService;
@Override
public Long createAttendanceException(HrmAttendanceExceptionSaveReqVO createReqVO) {
+ HrmEmployeeDO employee = employeeService.getEmployeeByUserId(
+ cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId());
+ if (employee == null) {
+ throw exception(EMPLOYEE_NOT_EXISTS);
+ }
HrmAttendanceExceptionDO attendanceException = BeanUtils.toBean(createReqVO, HrmAttendanceExceptionDO.class);
+ attendanceException.setUserId(employee.getId()).setDeptId(employee.getDeptId());
attendanceException.setNo(generateNo());
attendanceException.setStatus(HrmAuditStatusEnum.DRAFT.getStatus());
attendanceExceptionMapper.insert(attendanceException);
+ storageAttachmentApi.bindAttachments("file", "hrm_attendance_exception",
+ attendanceException.getId(), createReqVO.getBlobIds());
return attendanceException.getId();
}
@@ -56,14 +93,24 @@
@Override
public void updateAttendanceException(HrmAttendanceExceptionSaveReqVO updateReqVO) {
- validateAttendanceExceptionExists(updateReqVO.getId());
+ HrmAttendanceExceptionDO attendanceException = validateAttendanceExceptionExists(updateReqVO.getId());
+ if (!HrmAuditStatusEnum.DRAFT.getStatus().equals(attendanceException.getStatus())
+ && !HrmAuditStatusEnum.REJECT.getStatus().equals(attendanceException.getStatus())) {
+ throw exception(ATTENDANCE_EXCEPTION_UPDATE_FAIL_NOT_DRAFT);
+ }
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);
+ HrmAttendanceExceptionDO attendanceException = validateAttendanceExceptionExists(id);
+ if (!HrmAuditStatusEnum.DRAFT.getStatus().equals(attendanceException.getStatus())
+ && !HrmAuditStatusEnum.REJECT.getStatus().equals(attendanceException.getStatus())) {
+ throw exception(ATTENDANCE_EXCEPTION_DELETE_FAIL_NOT_DRAFT);
+ }
+ storageAttachmentApi.deleteAttachmentsByRecord("hrm_attendance_exception", id);
attendanceExceptionMapper.deleteById(id);
}
@@ -87,47 +134,127 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void submitAttendanceException(Long id, String processDefinitionKey, Long userId) {
- // 1. 鏍￠獙寮傚父鐢宠瀛樺湪涓斾负鑽夌鐘舵��
+ public void submitAttendanceException(Long id) {
+ // 1. 鏍￠獙瀛樺湪 + 鍙彁浜ょ姸鎬侊紙鑽夌 / 瀹℃牳涓嶉�氳繃锛�
HrmAttendanceExceptionDO exception = validateAttendanceExceptionExists(id);
- if (!HrmAuditStatusEnum.DRAFT.getStatus().equals(exception.getStatus())) {
- throw exception(ATTENDANCE_EXCEPTION_SUBMIT_FAIL_NOT_DRAFT);
+ if (!HrmAuditStatusEnum.DRAFT.getStatus().equals(exception.getStatus())
+ && !HrmAuditStatusEnum.REJECT.getStatus().equals(exception.getStatus())) {
+ throw exception(ATTENDANCE_EXCEPTION_SUBMIT_FAIL_NOT_EDITABLE);
}
- // 2. 鏍￠獙娴佺▼瀹氫箟瀛樺湪涓斾负婵�娲荤姸鎬�
- if (processDefinitionKey != null) {
- bpmProcessDefinitionService.getActiveProcessDefinition(processDefinitionKey);
+ // 2. 琛ュ崱绫诲瀷蹇呴』濉啓琛ュ崱鏃堕棿锛岄伩鍏嶅鏍搁�氳繃鍚庡洖濉�冨嫟璁板綍鏃跺嚭鐜扮┖鎸囬拡
+ if (HrmAttendanceExceptionTypeEnum.SUPPLEMENT.getType().equals(exception.getType())
+ && exception.getExceptionTime() == null) {
+ throw exception(ATTENDANCE_EXCEPTION_TIME_REQUIRED);
}
- // 3. 鍒涘缓瀹℃壒娴佺▼瀹炰緥
- String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId,
+ // 3. 鏍￠獙瀹℃壒閰嶇疆宸插惎鐢ㄤ笖閰嶇疆浜嗘湁鏁堝鎵逛汉锛堟湭閰嶇疆鏃舵姏鍑哄甫鏄庣‘鎻愮ず鐨勪笟鍔″紓甯革級
+ approvalConfigApi.validateApprovalEnabledAndGetApprovers(ATTENDANCE_APPROVE_BIZ_TYPE);
+
+ // 4. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋滐紝閬垮厤娈嬬暀銆屽鏍镐笉閫氳繃銆嶇殑鍘熷洜
+ if (attendanceExceptionMapper.submitAndResetAuditInfo(id, HrmAuditStatusEnum.PROCESS.getStatus()) != 1) {
+ throw exception(ATTENDANCE_EXCEPTION_SUBMIT_FAIL_NOT_EDITABLE);
+ }
+
+ // 5. 鍒涘缓 BPM 娴佺▼瀹炰緥锛屼娇瀹℃壒鍑虹幇鍦ㄣ�屽崗鍚屽姙鍏� - 鎴戠殑娴佺▼銆�
+ bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
new BpmProcessInstanceCreateReqDTO()
- .setProcessDefinitionKey(processDefinitionKey)
+ .setProcessDefinitionKey(ATTENDANCE_APPROVE_PROCESS_KEY)
.setBusinessKey(String.valueOf(id)));
+ }
- // 4. 鏇存柊寮傚父鐢宠鐘舵��
- attendanceExceptionMapper.updateById(HrmAttendanceExceptionDO.builder()
- .id(id)
- .processInstanceId(processInstanceId)
- .status(HrmAuditStatusEnum.PROCESS.getStatus())
- .build());
+ @Override
+ public Set<Long> getAttendanceExceptionApproverUserIds() {
+ return approvalConfigApi.getApproverUserIds(ATTENDANCE_APPROVE_BIZ_TYPE);
}
@Override
@Transactional(rollbackFor = Exception.class)
- public void updateAttendanceExceptionAuditStatus(Long id, Integer auditStatus) {
- // 1. 鏍￠獙寮傚父鐢宠瀛樺湪
+ public void auditAttendanceException(Long id, Boolean pass, String reviewRemark) {
+ // 1. 鏍￠獙瀛樺湪
HrmAttendanceExceptionDO exception = validateAttendanceExceptionExists(id);
- // 2. 鏍￠獙褰撳墠鐘舵�佷负瀹℃壒涓�
+ // 2. 鏍￠獙澶勪簬瀹℃壒涓姸鎬�
if (!HrmAuditStatusEnum.PROCESS.getStatus().equals(exception.getStatus())) {
- throw exception(ATTENDANCE_EXCEPTION_UPDATE_AUDIT_STATUS_FAIL);
+ throw exception(ATTENDANCE_EXCEPTION_AUDIT_FAIL_NOT_PROCESS);
}
- // 3. 鏇存柊鐘舵��
- attendanceExceptionMapper.updateById(HrmAttendanceExceptionDO.builder()
- .id(id)
- .status(auditStatus)
- .approveTime(LocalDateTime.now())
- .build());
+ // 2.1 琛ュ崱绫诲瀷蹇呴』濉啓琛ュ崱鏃堕棿锛岄伩鍏嶅鏍搁�氳繃鍚庡洖濉�冨嫟璁板綍鏃跺嚭鐜扮┖鎸囬拡
+ if (HrmAttendanceExceptionTypeEnum.SUPPLEMENT.getType().equals(exception.getType())
+ && exception.getExceptionTime() == null) {
+ throw exception(ATTENDANCE_EXCEPTION_TIME_REQUIRED);
+ }
+ // 3. 鏍￠獙褰撳墠鐧诲綍鐢ㄦ埛鏄涓氬姟绫诲瀷鐨勫鎵逛汉锛堟垨绛撅細浠讳竴浜哄潎鍙鏍革級
+ Long userId = getLoginUserId();
+ approvalConfigApi.validateApprover(ATTENDANCE_APPROVE_BIZ_TYPE, userId);
+ // 4. 瀹℃牳涓嶉�氳繃锛氬繀椤诲～鍐欏師鍥狅紝鐘舵�佺疆涓哄鏍镐笉閫氳繃锛岄��鍥炴彁浜や汉淇敼鍚庡彲閲嶆柊鎻愪氦
+ if (!Boolean.TRUE.equals(pass)) {
+ if (StrUtil.isBlank(reviewRemark)) {
+ throw exception(ATTENDANCE_EXCEPTION_AUDIT_REJECT_REASON_REQUIRED);
+ }
+ if (attendanceExceptionMapper.auditAttendanceException(id, HrmAuditStatusEnum.REJECT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(ATTENDANCE_EXCEPTION_AUDIT_FAIL_NOT_PROCESS);
+ }
+ return;
+ }
+ // 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄鏍搁�氳繃
+ if (attendanceExceptionMapper.auditAttendanceException(id, HrmAuditStatusEnum.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(ATTENDANCE_EXCEPTION_AUDIT_FAIL_NOT_PROCESS);
+ }
+
+ // 6. 瀹℃牳閫氳繃鍚庣疆涓氬姟閫昏緫锛氳ˉ鍗″洖濉笂涓嬬彮鏃堕棿 / 鍔犵彮鍥炲啓鍔犵彮鏃堕暱
+ if (HrmAttendanceExceptionTypeEnum.SUPPLEMENT.getType().equals(exception.getType())) {
+ log.info("[auditAttendanceException] 琛ュ崱鐢宠({}) 瀹℃壒閫氳繃锛屽紑濮嬫洿鏂拌�冨嫟璁板綍", id);
+ attendanceRecordService.supplementClockIn(exception);
+ } else if (HrmAttendanceExceptionTypeEnum.OVERTIME.getType().equals(exception.getType())) {
+ log.info("[auditAttendanceException] 鍔犵彮鐢宠({}) 瀹℃壒閫氳繃锛屽紑濮嬪洖鍐欏姞鐝椂闀�", id);
+ attendanceRecordService.recordOvertime(exception);
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateAttendanceExceptionAuditStatus(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;
+ }
+ HrmAttendanceExceptionDO exception = attendanceExceptionMapper.selectById(id);
+ if (attendanceExceptionMapper.updateAuditStatusByBpm(id, status, reason) != 1) {
+ log.warn("[updateAttendanceExceptionAuditStatus] 鑰冨嫟寮傚父鐢宠({}) 涓嶅浜庡鎵逛腑鐘舵�侊紝蹇界暐 BPM 缁撴灉({})", id, bpmStatus);
+ return;
+ }
+ // 瀹℃壒閫氳繃鍚庣疆涓氬姟閫昏緫锛氳ˉ鍗″洖濉笂涓嬬彮鏃堕棿 / 鍔犵彮鍥炲啓鍔犵彮鏃堕暱
+ if (status.equals(HrmAuditStatusEnum.APPROVE.getStatus()) && exception != null) {
+ if (HrmAttendanceExceptionTypeEnum.SUPPLEMENT.getType().equals(exception.getType())) {
+ log.info("[updateAttendanceExceptionAuditStatus] 琛ュ崱鐢宠({}) 瀹℃壒閫氳繃锛屽紑濮嬫洿鏂拌�冨嫟璁板綍", id);
+ attendanceRecordService.supplementClockIn(exception);
+ } else if (HrmAttendanceExceptionTypeEnum.OVERTIME.getType().equals(exception.getType())) {
+ log.info("[updateAttendanceExceptionAuditStatus] 鍔犵彮鐢宠({}) 瀹℃壒閫氳繃锛屽紑濮嬪洖鍐欏姞鐝椂闀�", id);
+ attendanceRecordService.recordOvertime(exception);
+ }
+ }
+ }
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鏄电О
+ *
+ * @param userId 鐢ㄦ埛缂栧彿
+ * @return 鏄电О锛岀敤鎴蜂笉瀛樺湪鏃惰繑鍥� null
+ */
+ private String getUserNickname(Long userId) {
+ if (userId == null) {
+ return null;
+ }
+ AdminUserRespDTO user = adminUserApi.getUser(userId);
+ return user == null ? null : user.getNickname();
}
}
\ No newline at end of file
--
Gitblit v1.9.3