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 | 84 +++++++++++++++++++++++++++++++++++++----
1 files changed, 75 insertions(+), 9 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 e4579e9..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
@@ -7,6 +7,9 @@
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;
@@ -45,6 +48,11 @@
*/
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
@@ -53,6 +61,8 @@
private StorageAttachmentApi storageAttachmentApi;
@Resource
private ApprovalConfigApi approvalConfigApi;
+ @Resource
+ private BpmProcessInstanceApi bpmProcessInstanceApi;
@Resource
private AdminUserApi adminUserApi;
@Resource
@@ -84,7 +94,8 @@
@Override
public void updateAttendanceException(HrmAttendanceExceptionSaveReqVO updateReqVO) {
HrmAttendanceExceptionDO attendanceException = validateAttendanceExceptionExists(updateReqVO.getId());
- if (!HrmAuditStatusEnum.DRAFT.getStatus().equals(attendanceException.getStatus())) {
+ 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);
@@ -95,7 +106,8 @@
@Override
public void deleteAttendanceException(Long id) {
HrmAttendanceExceptionDO attendanceException = validateAttendanceExceptionExists(id);
- if (!HrmAuditStatusEnum.DRAFT.getStatus().equals(attendanceException.getStatus())) {
+ 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);
@@ -130,11 +142,25 @@
throw exception(ATTENDANCE_EXCEPTION_SUBMIT_FAIL_NOT_EDITABLE);
}
- // 2. 鏍￠獙瀹℃壒閰嶇疆宸插惎鐢ㄤ笖閰嶇疆浜嗘湁鏁堝鎵逛汉锛堟湭閰嶇疆鏃舵姏鍑哄甫鏄庣‘鎻愮ず鐨勪笟鍔″紓甯革級
+ // 2. 琛ュ崱绫诲瀷蹇呴』濉啓琛ュ崱鏃堕棿锛岄伩鍏嶅鏍搁�氳繃鍚庡洖濉�冨嫟璁板綍鏃跺嚭鐜扮┖鎸囬拡
+ if (HrmAttendanceExceptionTypeEnum.SUPPLEMENT.getType().equals(exception.getType())
+ && exception.getExceptionTime() == null) {
+ throw exception(ATTENDANCE_EXCEPTION_TIME_REQUIRED);
+ }
+
+ // 3. 鏍￠獙瀹℃壒閰嶇疆宸插惎鐢ㄤ笖閰嶇疆浜嗘湁鏁堝鎵逛汉锛堟湭閰嶇疆鏃舵姏鍑哄甫鏄庣‘鎻愮ず鐨勪笟鍔″紓甯革級
approvalConfigApi.validateApprovalEnabledAndGetApprovers(ATTENDANCE_APPROVE_BIZ_TYPE);
- // 3. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋滐紝閬垮厤娈嬬暀銆屽鏍镐笉閫氳繃銆嶇殑鍘熷洜
- attendanceExceptionMapper.submitAndResetAuditInfo(id, HrmAuditStatusEnum.PROCESS.getStatus());
+ // 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(ATTENDANCE_APPROVE_PROCESS_KEY)
+ .setBusinessKey(String.valueOf(id)));
}
@Override
@@ -151,6 +177,11 @@
if (!HrmAuditStatusEnum.PROCESS.getStatus().equals(exception.getStatus())) {
throw exception(ATTENDANCE_EXCEPTION_AUDIT_FAIL_NOT_PROCESS);
}
+ // 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);
@@ -159,13 +190,17 @@
if (StrUtil.isBlank(reviewRemark)) {
throw exception(ATTENDANCE_EXCEPTION_AUDIT_REJECT_REASON_REQUIRED);
}
- attendanceExceptionMapper.auditAttendanceException(id, HrmAuditStatusEnum.REJECT.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (attendanceExceptionMapper.auditAttendanceException(id, HrmAuditStatusEnum.REJECT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(ATTENDANCE_EXCEPTION_AUDIT_FAIL_NOT_PROCESS);
+ }
return;
}
// 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄鏍搁�氳繃
- attendanceExceptionMapper.auditAttendanceException(id, HrmAuditStatusEnum.APPROVE.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ 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())) {
@@ -177,6 +212,37 @@
}
}
+ @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);
+ }
+ }
+ }
+
/**
* 鑾峰彇鐢ㄦ埛鏄电О
*
--
Gitblit v1.9.3