From ef75cf1b5e6f23f5ec039946ebaeb9e71ac864fc Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 10 二月 2026 16:43:02 +0800
Subject: [PATCH] 生成缺勤记录
---
src/main/java/com/ruoyi/staff/mapper/PersonalAttendanceRecordsMapper.java | 5 ++++-
doc/20260209_create_personal_attendance_records.sql | 3 ++-
src/main/java/com/ruoyi/staff/service/impl/PersonalAttendanceRecordsServiceImpl.java | 4 ++++
src/main/java/com/ruoyi/staff/task/PersonalAttendanceRecordsTask.java | 21 ++++++++++-----------
src/main/resources/mapper/staff/PersonalAttendanceRecordsMapper.xml | 17 ++++++++++++++---
5 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/doc/20260209_create_personal_attendance_records.sql b/doc/20260209_create_personal_attendance_records.sql
index 71b4565..0a25e18 100644
--- a/doc/20260209_create_personal_attendance_records.sql
+++ b/doc/20260209_create_personal_attendance_records.sql
@@ -13,5 +13,6 @@
tenant_id bigint not null comment '绉熸埛id',
create_time datetime null comment '褰曞叆鏃堕棿',
update_time datetime null comment '鏇存柊鏃堕棿',
- index idx_staff_on_job_id (staff_on_job_id)
+ index idx_staff_on_job_id (staff_on_job_id),
+ unique idx_staff_on_job_id_date (staff_on_job_id, date)
);
diff --git a/src/main/java/com/ruoyi/staff/mapper/PersonalAttendanceRecordsMapper.java b/src/main/java/com/ruoyi/staff/mapper/PersonalAttendanceRecordsMapper.java
index 8abb915..dddd117 100644
--- a/src/main/java/com/ruoyi/staff/mapper/PersonalAttendanceRecordsMapper.java
+++ b/src/main/java/com/ruoyi/staff/mapper/PersonalAttendanceRecordsMapper.java
@@ -11,6 +11,7 @@
import org.apache.ibatis.annotations.Param;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.util.List;
/**
@@ -25,5 +26,7 @@
public interface PersonalAttendanceRecordsMapper extends BaseMapper<PersonalAttendanceRecords> {
IPage<PersonalAttendanceRecordsDto> listPage(Page page, @Param("params") PersonalAttendanceRecordsDto personalAttendanceRecordsDto);
- List<StaffOnJob> selectStaffWithoutAttendanceRecord(@Param("date") LocalDate date);
+ List<StaffOnJob> selectStaffWithoutAttendanceRecordBeforeTime(@Param("date") LocalDate date, @Param("entryDeadline") LocalDateTime entryDeadline);
+
+ boolean existsAttendanceRecord(@Param("staffOnJobId") Long staffOnJobId, @Param("date") LocalDate date);
}
diff --git a/src/main/java/com/ruoyi/staff/service/impl/PersonalAttendanceRecordsServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/PersonalAttendanceRecordsServiceImpl.java
index bcc3d5d..a0cf8f2 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/PersonalAttendanceRecordsServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/PersonalAttendanceRecordsServiceImpl.java
@@ -18,6 +18,7 @@
import com.ruoyi.staff.pojo.StaffOnJob;
import com.ruoyi.staff.service.PersonalAttendanceRecordsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.staff.task.PersonalAttendanceRecordsTask;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -48,6 +49,9 @@
private StaffOnJobMapper staffOnJobMapper;
@Autowired
+ private PersonalAttendanceRecordsTask personalAttendanceRecordsTask;
+
+ @Autowired
private ISysDictDataService dictDataService;
@Autowired
diff --git a/src/main/java/com/ruoyi/staff/task/PersonalAttendanceRecordsTask.java b/src/main/java/com/ruoyi/staff/task/PersonalAttendanceRecordsTask.java
index b44b659..91a6850 100644
--- a/src/main/java/com/ruoyi/staff/task/PersonalAttendanceRecordsTask.java
+++ b/src/main/java/com/ruoyi/staff/task/PersonalAttendanceRecordsTask.java
@@ -35,32 +35,31 @@
* 瀹氭椂浠诲姟锛氭瘡澶╁噷鏅�1鐐规墽琛�
* 鎺掗櫎浠婂ぉ鍒氬叆鑱岀殑鍛樺伐
*/
-// @Scheduled(cron = "0 0 1 * * ?")
- @Scheduled(cron = "0/30 * * * * ?")
+ @Scheduled(cron = "0 0 1 * * ?")
public void generateAbsenceRecords() {
-
try {
// 鑾峰彇鏄ㄦ棩鏃ユ湡
LocalDate yesterday = LocalDate.now().minusDays(1);
- log.info("鐢熸垚鏃ユ湡锛歿} 鐨勭己鍕よ褰�", yesterday);
// 鐩存帴鏌ヨ鏄ㄥぉ娌℃湁鑰冨嫟璁板綍鐨勫湪鑱屽憳宸ワ紙鎺掗櫎浠婂ぉ鍒氬叆鑱岀殑锛�
- List<StaffOnJob> staffWithoutAttendance = personalAttendanceRecordsMapper.selectStaffWithoutAttendanceRecord(yesterday);
+ LocalDateTime todayStart = LocalDate.now().atStartOfDay();
+ List<StaffOnJob> staffWithoutAttendance = personalAttendanceRecordsMapper.selectStaffWithoutAttendanceRecordBeforeTime(yesterday, todayStart);
+
// 閬嶅巻娌℃湁鑰冨嫟璁板綍鐨勫憳宸ワ紝鐢熸垚缂哄嫟璁板綍
for (StaffOnJob staff : staffWithoutAttendance) {
try {
+ boolean exists = personalAttendanceRecordsMapper.existsAttendanceRecord(staff.getId(), yesterday);
+ if (exists) {
+ log.debug("鍛樺伐{}鍦▄}鐨勮�冨嫟璁板綍宸插瓨鍦紝璺宠繃鐢熸垚", staff.getStaffName(), yesterday);
+ continue;
+ }
+
PersonalAttendanceRecords absenceRecord = new PersonalAttendanceRecords();
absenceRecord.setStaffOnJobId(staff.getId());
absenceRecord.setDate(yesterday);
- absenceRecord.setWorkStartAt(null);
- absenceRecord.setWorkEndAt(null);
- absenceRecord.setWorkHours(BigDecimal.ZERO);
absenceRecord.setStatus(4); // 璁剧疆鐘舵�佷负缂哄嫟
absenceRecord.setRemark("绯荤粺鑷姩鐢熸垚-缂哄嫟");
- absenceRecord.setTenantId(staff.getTenantId());
- absenceRecord.setCreateTime(LocalDateTime.now());
- absenceRecord.setUpdateTime(LocalDateTime.now());
personalAttendanceRecordsService.save(absenceRecord);
} catch (Exception e) {
diff --git a/src/main/resources/mapper/staff/PersonalAttendanceRecordsMapper.xml b/src/main/resources/mapper/staff/PersonalAttendanceRecordsMapper.xml
index 5f423e8..a589f71 100644
--- a/src/main/resources/mapper/staff/PersonalAttendanceRecordsMapper.xml
+++ b/src/main/resources/mapper/staff/PersonalAttendanceRecordsMapper.xml
@@ -41,11 +41,12 @@
</if>
</select>
- <select id="selectStaffWithoutAttendanceRecord" resultType="com.ruoyi.staff.pojo.StaffOnJob">
+ <!-- 鏌ヨ鎸囧畾鏃ユ湡娌℃湁鑰冨嫟璁板綍鐨勫湪鑱屽憳宸ワ紙鍦ㄦ寚瀹氭椂闂翠箣鍓嶅叆鑱岀殑锛� -->
+ <select id="selectStaffWithoutAttendanceRecordBeforeTime" resultType="com.ruoyi.staff.pojo.StaffOnJob">
SELECT soj.*
FROM staff_on_job soj
- WHERE soj.status = 1
- AND DATE(soj.create_time) < #{date}
+ WHERE soj.staff_state = 1
+ AND soj.create_time < #{entryDeadline}
AND NOT EXISTS (
SELECT 1
FROM personal_attendance_records par
@@ -53,4 +54,14 @@
AND par.date = #{date}
)
</select>
+
+ <!-- 妫�鏌ユ寚瀹氬憳宸ュ湪鎸囧畾鏃ユ湡鏄惁宸插瓨鍦ㄨ�冨嫟璁板綍 -->
+ <select id="existsAttendanceRecord" resultType="boolean">
+ SELECT EXISTS (
+ SELECT 1
+ FROM personal_attendance_records
+ WHERE staff_on_job_id = #{staffOnJobId}
+ AND date = #{date}
+ )
+ </select>
</mapper>
--
Gitblit v1.9.3