From 962f78c8383e7c884ddb08c951c15e5ba6eb4cb8 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 23 十月 2026 15:43:33 +0800
Subject: [PATCH] fix: 完善审批流程与业务状态校验
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceExceptionMapper.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceExceptionMapper.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceExceptionMapper.java
index fc1afba..01b571b 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceExceptionMapper.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceExceptionMapper.java
@@ -5,6 +5,7 @@
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceExceptionPageReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceExceptionDO;
+import cn.iocoder.yudao.module.hrm.enums.HrmAuditStatusEnum;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
@@ -45,6 +46,8 @@
default int submitAndResetAuditInfo(Long id, Integer status) {
return update(null, new LambdaUpdateWrapper<HrmAttendanceExceptionDO>()
.eq(HrmAttendanceExceptionDO::getId, id)
+ .in(HrmAttendanceExceptionDO::getStatus,
+ HrmAuditStatusEnum.DRAFT.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())
.set(HrmAttendanceExceptionDO::getStatus, status)
.set(HrmAttendanceExceptionDO::getReviewerId, null)
.set(HrmAttendanceExceptionDO::getReviewerName, null)
@@ -68,12 +71,15 @@
String reviewerName, String reviewRemark) {
return update(null, new LambdaUpdateWrapper<HrmAttendanceExceptionDO>()
.eq(HrmAttendanceExceptionDO::getId, id)
+ .eq(HrmAttendanceExceptionDO::getStatus, HrmAuditStatusEnum.PROCESS.getStatus())
.set(HrmAttendanceExceptionDO::getStatus, status)
.set(HrmAttendanceExceptionDO::getReviewerId, reviewerId)
.set(HrmAttendanceExceptionDO::getReviewerName, reviewerName)
.set(HrmAttendanceExceptionDO::getReviewTime, LocalDateTime.now())
.set(HrmAttendanceExceptionDO::getReviewRemark, reviewRemark)
- .set(HrmAttendanceExceptionDO::getApproveTime, LocalDateTime.now()));
+ // 浠呭鏍搁�氳繃鏃跺啓鍏ラ�氳繃鏃堕棿锛岄┏鍥炰笉鍐�
+ .set(HrmAuditStatusEnum.APPROVE.getStatus().equals(status),
+ HrmAttendanceExceptionDO::getApproveTime, LocalDateTime.now()));
}
}
\ No newline at end of file
--
Gitblit v1.9.3