From 5f19e04862f9a2ba180d0d7fb44726e62547fc61 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 09 二月 2026 17:21:54 +0800
Subject: [PATCH] 打卡签到列表和新增
---
src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java | 1 -
src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java | 2 +-
src/main/java/com/ruoyi/staff/mapper/PersonalAttendanceRecordsMapper.java | 17 ++++++++++++++++-
doc/20260209_create_personal_attendance_records.sql | 17 +++++++++++++++++
src/main/java/com/ruoyi/staff/dto/PersonalAttendanceRecordsDto.java | 13 +++++++++++++
5 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/doc/20260209_create_personal_attendance_records.sql b/doc/20260209_create_personal_attendance_records.sql
new file mode 100644
index 0000000..71b4565
--- /dev/null
+++ b/doc/20260209_create_personal_attendance_records.sql
@@ -0,0 +1,17 @@
+#鍛樺伐鑰冨嫟琛�
+drop table if exists personal_attendance_records;
+create table personal_attendance_records
+(
+ id bigint auto_increment primary key,
+ staff_on_job_id bigint not null default 0 comment '鍛樺伐鍦ㄨ亴id',
+ date date not null comment '鏃ユ湡',
+ work_start_at datetime null comment '宸ヤ綔寮�濮嬫椂闂�',
+ work_end_at datetime null comment '宸ヤ綔缁撴潫鏃堕棿',
+ work_hours decimal(5,2) null comment '宸ヤ綔鏃堕暱',
+ status tinyint not null default 0 comment '鐘舵�� 0姝ｅ父 1杩熷埌 2鏃╅��',
+ remark text null comment '澶囨敞',
+ 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)
+);
diff --git a/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java b/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java
index 7ac13bd..66f1710 100644
--- a/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java
+++ b/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.pojo.HolidayApplication;
-import com.ruoyi.staff.pojo.PersonalAttendanceRecords;
import com.ruoyi.staff.service.HolidayApplicationService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
diff --git a/src/main/java/com/ruoyi/staff/dto/PersonalAttendanceRecordsDto.java b/src/main/java/com/ruoyi/staff/dto/PersonalAttendanceRecordsDto.java
new file mode 100644
index 0000000..47f81e1
--- /dev/null
+++ b/src/main/java/com/ruoyi/staff/dto/PersonalAttendanceRecordsDto.java
@@ -0,0 +1,13 @@
+package com.ruoyi.staff.dto;
+
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.staff.pojo.PersonalAttendanceRecords;
+import lombok.Data;
+
+@Data
+public class PersonalAttendanceRecordsDto extends PersonalAttendanceRecords {
+ private String staffName;
+ private String staffNo;
+ private String deptName;
+ private Long deptId;
+}
diff --git a/src/main/java/com/ruoyi/staff/mapper/PersonalAttendanceRecordsMapper.java b/src/main/java/com/ruoyi/staff/mapper/PersonalAttendanceRecordsMapper.java
index 402bb45..77ce68c 100644
--- a/src/main/java/com/ruoyi/staff/mapper/PersonalAttendanceRecordsMapper.java
+++ b/src/main/java/com/ruoyi/staff/mapper/PersonalAttendanceRecordsMapper.java
@@ -1,9 +1,24 @@
package com.ruoyi.staff.mapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.staff.dto.PersonalAttendanceRecordsDto;
+import com.ruoyi.staff.dto.StaffOnJobDto;
import com.ruoyi.staff.pojo.PersonalAttendanceRecords;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.staff.pojo.StaffOnJob;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-02-09 01:20:07
+ */
@Mapper
public interface PersonalAttendanceRecordsMapper extends BaseMapper<PersonalAttendanceRecords> {
+ IPage<PersonalAttendanceRecordsDto> listPage(Page page, @Param("params") PersonalAttendanceRecordsDto personalAttendanceRecordsDto);
}
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
index 31d74b9..785b722 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
@@ -66,7 +66,7 @@
/**
* 閮ㄩ棬
*/
- private Integer sysDeptId;
+ private Long sysDeptId;
/**
* 瀹跺涵浣忓潃
--
Gitblit v1.9.3