第一次提交

airport-attendance/pom.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.sundot.airport</groupId>
+        <artifactId>airport</artifactId>
+        <version>3.9.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>airport-attendance</artifactId>
+
+    <description>
+        attendance 考勤管理模块
+    </description>
+
+    <dependencies>
+
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>com.sundot.airport</groupId>
+            <artifactId>airport-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sundot.airport</groupId>
+            <artifactId>airport-system</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.sundot.airport</groupId>
+            <artifactId>airport-system</artifactId>
+        </dependency>
+
+        <!-- 考试模块，用于打卡事件监听 -->
+        <dependency>
+            <groupId>com.sundot.airport</groupId>
+            <artifactId>airport-exam</artifactId>
+        </dependency>
+
+    </dependencies>
+</project>

airport-attendance/src/main/java/com/sundot/airport/attendance/domain/AttendanceArea.java

@@ -0,0 +1,56 @@
+package com.sundot.airport.attendance.domain;
+
+import com.sundot.airport.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 打卡范围
+ */
+@Data
+@ApiModel(value = "AttendanceArea对象",description = "打卡范围")
+public class AttendanceArea extends BaseEntity {
+    /**
+     * 主键id
+     */
+    @ApiModelProperty("id")
+    private Integer id;
+    /**
+     * 区域名称
+     */
+    @ApiModelProperty("区域名称")
+    private String areaName;
+    /**
+     * 详细地址
+     */
+    @ApiModelProperty("详细地址")
+    private String address;
+    /**
+     * 中心点经度
+     */
+    @ApiModelProperty("中心点经度")
+    private BigDecimal longitude;
+    /**
+     * 中心点纬度
+     */
+    @ApiModelProperty("中心点纬度")
+    private BigDecimal latitude;
+    /**
+     * 打卡有效半径（单位：米）
+     */
+    @ApiModelProperty("打卡有效半径（单位：米）")
+    private Integer radius;
+    /**
+     * 状态（0=禁用 1=启用
+     */
+    @ApiModelProperty("状态（0=禁用 1=启用")
+    private Boolean status;
+    /**
+     * 用于接收距离计算结果
+     */
+    @ApiModelProperty("用于接收距离计算结果")
+    private BigDecimal distance;
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/domain/AttendanceCheckRecord.java

@@ -0,0 +1,124 @@
+package com.sundot.airport.attendance.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sundot.airport.common.annotation.Excel;
+import com.sundot.airport.common.core.domain.BaseEntity;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 打卡记录对象 attendance_check_record
+ *
+ * @author wangchong
+ * @date 2025-07-10
+ */
+@Data
+public class AttendanceCheckRecord extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 租户号
+     */
+    private String tenantId;
+
+    /**
+     * 乐观锁
+     */
+    private Long revision;
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 打卡人ID
+     */
+    private Long userId;
+
+    /**
+     * 打卡类型
+     */
+    private String checkInType;
+
+    /**
+     * 打卡时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "打卡时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 3)
+    private Date checkInTime;
+
+    /**
+     * 打卡位置
+     */
+    private String checkInPosition;
+
+    /**
+     * 打卡人名称
+     */
+    @Excel(name = "打卡人姓名", sort = 1)
+    private String userName;
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注", sort = 4)
+    private String remark;
+
+    /**
+     * 打卡类型名称
+     */
+    @Excel(name = "打卡类型名称", sort = 2)
+    private String checkInTypeDesc;
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("tenantId", getTenantId())
+                .append("revision", getRevision())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("id", getId())
+                .append("userId", getUserId())
+                .append("checkInType", getCheckInType())
+                .append("checkInTime", getCheckInTime())
+                .append("userName", getUserName())
+                .append("remark", getRemark())
+                .append("checkInTypeDesc", getCheckInTypeDesc())
+                .append("checkInDate", getCheckInDate())
+                .toString();
+    }
+
+    /**
+     * 打卡日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date checkInDate;
+
+
+    /**
+     * 打卡日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date checkInDateStart;
+
+
+    /**
+     * 打卡日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date checkInDateEnd;
+    /**
+     * 是否为梭班打卡
+     */
+    private Boolean shuttleShift;
+    /**
+     * 班次类型标识,SHUTTLE"表示梭班,后期有什么标识可以扩展
+     */
+    private String shiftType;
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/domain/AttendancePostRecord.java

@@ -0,0 +1,249 @@
+package com.sundot.airport.attendance.domain;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.sundot.airport.common.annotation.Excel;
+import com.sundot.airport.common.core.domain.BaseEntity;
+
+
+/**
+ * 上岗记录对象 gitattendance_post_record
+ *
+ * @author wangchong
+ * @date 2025-07-10
+ */
+@Data
+public class AttendancePostRecord extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 租户号
+     */
+    private String tenantId;
+
+    /**
+     * 乐观锁
+     */
+    private Long revision;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 通道编码
+     */
+    private String channelCode;
+
+    /**
+     * 班次编码
+     */
+    private String shiftCode;
+
+    /**
+     * 上岗时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "上岗时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 5)
+    private Date checkInTime;
+
+    /**
+     * 离岗时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "离岗时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 6)
+    private Date checkOutTime;
+
+    /**
+     * 工作时长(分钟)
+     */
+    @Excel(name = "工作时长(分钟)", sort = 7)
+    private Long workDuration;
+
+    /**
+     * 考勤状态
+     */
+    private String status;
+
+    /**
+     * 考勤日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "考勤日期", width = 30, dateFormat = "yyyy-MM-dd", sort = 4)
+    private Date attendanceDate;
+
+    /**
+     * 考勤班组ID
+     */
+    private Long attendanceTeamId;
+
+    /**
+     * 加班时长(分钟)
+     */
+    private Long overDuration;
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 考勤班组名称
+     */
+    @Excel(name = "班组名称", sort = 2)
+    private String attendanceTeamName;
+
+    /**
+     * 考勤科室ID
+     */
+    private Long attendanceDepartmentId;
+
+    /**
+     * 考勤科室名称
+     */
+    @Excel(name = "科室名称", sort = 3)
+    private String attendanceDepartmentName;
+
+    /**
+     * 考勤机构站ID
+     */
+    private Long attendanceStationId;
+
+    /**
+     * 考勤机构站名称
+     */
+    private String attendanceStationName;
+
+    /**
+     * 通道名称
+     */
+    @Excel(name = "通道名称", sort = 10)
+    private String channelName;
+
+    /**
+     * 区域编码
+     */
+    private String regionalCode;
+
+    /**
+     * 区域名称
+     */
+    @Excel(name = "区域名称", sort = 9)
+    private String regionalName;
+
+    /**
+     * 航站楼编码
+     */
+    private String terminlCode;
+
+    /**
+     * 航站楼名称
+     */
+    @Excel(name = "航站楼名称", sort = 8)
+    private String terminlName;
+
+    /**
+     * 用户名称
+     */
+    @Excel(name = "用户姓名", sort = 1)
+    private String userName;
+
+    /**
+     * 班次名称
+     */
+    private String shiftName;
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注", sort = 12)
+    private String remark;
+
+    /**
+     * 考勤状态名称
+     */
+    private String statusDesc;
+
+    /**
+     * 岗位编码
+     */
+    private String positionCode;
+
+    @Override
+    public String toString() {
+        return "AttendancePostRecord{" +
+                "tenantId='" + tenantId + '\'' +
+                ", revision=" + revision +
+                ", userId=" + userId +
+                ", channelCode='" + channelCode + '\'' +
+                ", shiftCode='" + shiftCode + '\'' +
+                ", checkInTime=" + checkInTime +
+                ", checkOutTime=" + checkOutTime +
+                ", workDuration=" + workDuration +
+                ", status='" + status + '\'' +
+                ", attendanceDate=" + attendanceDate +
+                ", attendanceTeamId=" + attendanceTeamId +
+                ", overDuration=" + overDuration +
+                ", id=" + id +
+                ", attendanceTeamName='" + attendanceTeamName + '\'' +
+                ", attendanceDepartmentId=" + attendanceDepartmentId +
+                ", attendanceDepartmentName='" + attendanceDepartmentName + '\'' +
+                ", attendanceStationId=" + attendanceStationId +
+                ", attendanceStationName='" + attendanceStationName + '\'' +
+                ", channelName='" + channelName + '\'' +
+                ", regionalCode='" + regionalCode + '\'' +
+                ", regionalName='" + regionalName + '\'' +
+                ", terminlCode='" + terminlCode + '\'' +
+                ", terminlName='" + terminlName + '\'' +
+                ", userName='" + userName + '\'' +
+                ", shiftName='" + shiftName + '\'' +
+                ", remark='" + remark + '\'' +
+                ", statusDesc='" + statusDesc + '\'' +
+                ", positionCode='" + positionCode + '\'' +
+                ", positionName='" + positionName + '\'' +
+                ", locked=" + locked +
+                ", lockTime=" + lockTime +
+                '}';
+    }
+
+    /**
+     * 岗位名称
+     */
+    @Excel(name = "岗位名称", sort = 11)
+    private String positionName;
+
+
+    /**
+     * 是否锁定
+     */
+    private Boolean locked;
+
+    /**
+     * 锁定时间
+     */
+    private Date lockTime;
+
+    private Date checkInTimeStart;
+
+    private Date checkInTimeEnd;
+
+    private Integer checkOutTimeType;
+    /**
+     * 考勤开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date beginTime;
+    /**
+     * 考勤结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
+
+
+
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/domain/AttendanceRecord.java

@@ -0,0 +1,168 @@
+package com.sundot.airport.attendance.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sundot.airport.common.annotation.Excel;
+import com.sundot.airport.common.core.domain.BaseEntity;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 考勤记录对象 attendance_record
+ *
+ * @author wangchong
+ * @date 2025-07-10
+ */
+@Data
+public class AttendanceRecord extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 租户号
+     */
+    private String tenantId;
+
+    /**
+     * 乐观锁
+     */
+    private Long revision;
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 签到时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "签到时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 5)
+    private Date checkInTime;
+
+    /**
+     * 签退时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "签退时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 6)
+    private Date checkOutTime;
+
+    /**
+     * 工作时长(分钟)
+     */
+    @Excel(name = "工作时长(分钟)", sort = 7)
+    private Long workDuration;
+
+    /**
+     * 考勤状态
+     */
+    private String status;
+
+    /**
+     * 班组编码
+     */
+    private String teamCode;
+
+    /**
+     * 班组名称
+     */
+    @Excel(name = "班组名称", sort = 3)
+    private String teamName;
+
+    /**
+     * 科室编码
+     */
+    private String departmentCode;
+
+    /**
+     * 科室名称
+     */
+    @Excel(name = "科室名称", sort = 2)
+    private String departmentName;
+
+    /**
+     * 机构站编码
+     */
+    private String stationCode;
+
+    /**
+     * 机构站名称
+     */
+    private String stationName;
+
+    /**
+     * 用户名称
+     */
+    @Excel(name = "用户姓名", sort = 1)
+    private String userName;
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注", sort = 8)
+    private String remark;
+
+    /**
+     * 考勤日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "考勤日期", width = 30, dateFormat = "yyyy-MM-dd", sort = 4)
+    private Date attendanceDate;
+
+    /**
+     * 加班时长(分钟)
+     */
+    private Long overDuration;
+
+    /**
+     * 考勤状态名称
+     */
+    private String statusDesc;
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("tenantId", getTenantId())
+                .append("revision", getRevision())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("id", getId())
+                .append("userId", getUserId())
+                .append("checkInTime", getCheckInTime())
+                .append("checkOutTime", getCheckOutTime())
+                .append("workDuration", getWorkDuration())
+                .append("status", getStatus())
+                .append("teamCode", getTeamCode())
+                .append("teamName", getTeamName())
+                .append("departmentCode", getDepartmentCode())
+                .append("departmentName", getDepartmentName())
+                .append("stationCode", getStationCode())
+                .append("stationName", getStationName())
+                .append("userName", getUserName())
+                .append("remark", getRemark())
+                .append("attendanceDate", getAttendanceDate())
+                .append("overDuration", getOverDuration())
+                .append("statusDesc", getStatusDesc())
+                .toString();
+    }
+
+    /**
+     * 考勤日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date attendanceDateStart;
+
+    /**
+     * 考勤日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date attendanceDateEnd;
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/domain/AttendanceTeamUserRecord.java

@@ -0,0 +1,71 @@
+package com.sundot.airport.attendance.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.sundot.airport.common.annotation.Excel;
+import com.sundot.airport.common.core.domain.BaseEntity;
+
+/**
+ * 考勤班组成员对象 attendance_team_user_record
+ * 
+ * @author ruoyi
+ * @date 2025-09-06
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class AttendanceTeamUserRecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户ID */
+    @Excel(name = "用户ID")
+    @ApiModelProperty("用户ID")
+    private Long userId;
+
+    /** 用户code */
+    @Excel(name = "用户code")
+    @ApiModelProperty("用户code")
+    private String userCode;
+
+    /** 用户名称 */
+    @Excel(name = "用户名称")
+    @ApiModelProperty("用户名称")
+    private String userName;
+
+    /** 航站楼编码 */
+    @Excel(name = "航站楼编码")
+    @ApiModelProperty("航站楼编码")
+    private String terminlCode;
+
+    /** 航站楼名称 */
+    @Excel(name = "航站楼名称")
+    @ApiModelProperty("航站楼名称")
+    private String terminlName;
+
+    /** 考勤日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "考勤日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("考勤日期")
+    private Date attendanceDate;
+
+    /** 考勤班组ID */
+    @Excel(name = "考勤班组ID")
+    @ApiModelProperty("考勤班组ID")
+    private Long attendanceTeamId;
+
+    /** 考勤班组名称 */
+    @Excel(name = "考勤班组名称")
+    @ApiModelProperty("考勤班组名称")
+    private String attendanceTeamName;
+
+    private  Date attendanceDateStart;
+
+    private  Date attendanceDateEnd;
+
+
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/domain/portrait/StationDeptWorkStats.java

@@ -0,0 +1,47 @@
+package com.sundot.airport.attendance.domain.portrait;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 站级和科级工作指标统计信息
+ * 用于表示站级和下属科级的工作指标统计信息
+ */
+@Data
+public class StationDeptWorkStats {
+    /**
+     * 统计维度（站和科）
+     */
+    private String dimension;
+    
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+    
+    /**
+     * 部门名称
+     */
+    private String deptName;
+    
+    /**
+     * 人均出勤天数
+     */
+    private BigDecimal avgWorkingDays;
+    
+    /**
+     * 人均上岗时长
+     * 单位：小时
+     */
+    private BigDecimal avgWorkingHours;
+    
+    // 添加setter方法
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+    
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/domain/portrait/WorkDateStats.java

@@ -0,0 +1,18 @@
+package com.sundot.airport.attendance.domain.portrait;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 出勤天数统计信息
+ * 用于表示出勤天数的统计信息，包括总出勤天数和平均人数
+ */
+@Data
+public class WorkDateStats {
+    /** 总出勤天数 */
+    private Integer totalWorkingDays;
+    
+    /** 平均人数 */
+    private BigDecimal averagePersonnel;
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/domain/portrait/WorkHoursStats.java

@@ -0,0 +1,18 @@
+package com.sundot.airport.attendance.domain.portrait;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 上岗时长统计信息
+ * 用于表示上岗时长的统计信息，包括总上岗时长和平均人数
+ */
+@Data
+public class WorkHoursStats {
+    /** 总上岗时长(小时) */
+    private Long totalWorkingHours;
+    
+    /** 平均上岗时长 */
+    private BigDecimal averagePersonnel;
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/dto/AttendancePostRecordImportVO.java

@@ -0,0 +1,70 @@
+package com.sundot.airport.attendance.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sundot.airport.common.annotation.Excel;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 上岗记录导入
+ *
+ * @Author: wangchong
+ * @Date: 2025/7/16 14:55
+ **/
+@Data
+public class AttendancePostRecordImportVO implements Serializable {
+    private static final long serialVersionUID = 4927088909940841778L;
+
+    /**
+     * 用户名称
+     */
+    @Excel(name = "用户姓名（登录账号）", width = 30, sort = 1)
+    private String userName;
+
+    /**
+     * 考勤日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "考勤日期（yyyy-MM-dd）", width = 30, dateFormat = "yyyy-MM-dd", sort = 2)
+    private Date attendanceDate;
+
+    /**
+     * 上岗时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "上岗时间（yyyy-MM-dd HH:mm:ss）", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 3)
+    private Date checkInTime;
+
+    /**
+     * 离岗时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "离岗时间（yyyy-MM-dd HH:mm:ss）", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 4)
+    private Date checkOutTime;
+
+    /**
+     * 考勤班组名称
+     */
+    @Excel(name = "班组（机构站/科室/班组）", width = 30, sort = 5)
+    private String attendanceTeamName;
+
+    /**
+     * 通道名称
+     */
+    @Excel(name = "通道（航站楼/区域/通道）", width = 30, sort = 6)
+    private String channelName;
+
+    /**
+     * 岗位名称
+     */
+    @Excel(name = "岗位名称", width = 30, sort = 7)
+    private String positionName;
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注", width = 30, sort = 8)
+    private String remark;
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/dto/AttendanceRecordCountDTO.java

@@ -0,0 +1,27 @@
+package com.sundot.airport.attendance.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+@Data
+public class AttendanceRecordCountDTO {
+
+
+    @ApiModelProperty("通道总数")
+    private Integer channelCount;
+
+
+    @ApiModelProperty("维护人数")
+    private Integer maintainCount;
+
+    @ApiModelProperty("在岗人数(上通道人数)")
+    private Integer onDutyCount;
+
+
+    @ApiModelProperty("航站楼详细在岗信息")
+    private List<AttendanceRecordTerminlCountDetailDTO> terminlDetail;
+
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/dto/AttendanceRecordCountDetailDTO.java

@@ -0,0 +1,48 @@
+package com.sundot.airport.attendance.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class AttendanceRecordCountDetailDTO {
+
+    @ApiModelProperty("航站楼编码")
+    private String terminlCode;
+
+    @ApiModelProperty("航站楼名称")
+    private String terminlName;
+
+    @ApiModelProperty("区域code")
+    private String regionalCode;
+
+    @ApiModelProperty("区域名称")
+    private String regionalName;
+
+    @ApiModelProperty("通道名称")
+    private String channelName;
+
+    @ApiModelProperty("通道编码")
+    private String channelCode;
+
+    @ApiModelProperty("班级名称")
+    private String attendanceTeamName;
+
+    @ApiModelProperty("班级编码")
+    private String attendanceTeamCode;
+
+    @ApiModelProperty("状态(0:关闭 1:开启)")
+    private String status;
+
+    @ApiModelProperty("在岗人数")
+    private Integer onDutyCount;
+
+    @ApiModelProperty("在岗班组")
+     private String onDutyTeamName;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("上岗时间")
+    private Date onDutyTime;
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/dto/AttendanceRecordCountRegionDTO.java

@@ -0,0 +1,33 @@
+package com.sundot.airport.attendance.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AttendanceRecordCountRegionDTO {
+    @ApiModelProperty("航站楼编码")
+    private String terminlCode;
+
+    @ApiModelProperty("航站楼名称")
+    private String terminlName;
+
+    @ApiModelProperty("区域code")
+    private String regionalCode;
+
+    @ApiModelProperty("区域名称")
+    private String regionalName;
+
+    @ApiModelProperty("开放人数量")
+    private Integer  openUserCount;
+
+    @ApiModelProperty("开放通道数")
+    private Integer openChannelCount;
+
+
+    @ApiModelProperty("各个通道下各个班组在岗详情")
+    private List<AttendanceRecordCountDetailDTO> detailList;
+
+
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/dto/AttendanceRecordCountWaitDTO.java

@@ -0,0 +1,35 @@
+package com.sundot.airport.attendance.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class AttendanceRecordCountWaitDTO {
+    @ApiModelProperty("航站楼编码")
+    private String terminlCode;
+
+    @ApiModelProperty("航站楼名称")
+    private String terminlName;
+
+    @ApiModelProperty("区域code")
+    private Long regionalCode;
+
+    @ApiModelProperty("区域名称")
+    private String regionalName;
+
+    @ApiModelProperty("待岗人数")
+    private Integer waitCount;
+
+    @ApiModelProperty("待岗班组")
+    private String waitTeamName;
+
+    @ApiModelProperty("待岗班组code")
+    private Long waitTeamCode;
+
+    @ApiModelProperty("下岗时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date checkOutTime;
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/dto/AttendanceRecordImportVO.java

@@ -0,0 +1,52 @@
+package com.sundot.airport.attendance.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sundot.airport.common.annotation.Excel;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 考勤记录导入
+ *
+ * @Author: wangchong
+ * @Date: 2025/7/16 14:54
+ **/
+@Data
+public class AttendanceRecordImportVO implements Serializable {
+    private static final long serialVersionUID = 2245380666800347159L;
+
+    /**
+     * 用户姓名（登录账号）
+     */
+    @Excel(name = "用户姓名（登录账号）", width = 30, sort = 1)
+    private String userName;
+
+    /**
+     * 考勤日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "考勤日期（yyyy-MM-dd）", width = 30, dateFormat = "yyyy-MM-dd", sort = 2)
+    private Date attendanceDate;
+
+    /**
+     * 签到时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "签到时间（yyyy-MM-dd HH:mm:ss）", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 3)
+    private Date checkInTime;
+
+    /**
+     * 签退时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "签退时间（yyyy-MM-dd HH:mm:ss）", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 4)
+    private Date checkOutTime;
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注", sort = 5)
+    private String remark;
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/dto/AttendanceRecordTerminlCountDetailDTO.java

@@ -0,0 +1,42 @@
+package com.sundot.airport.attendance.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 各个航站楼下的信息
+ */
+@Data
+public class AttendanceRecordTerminlCountDetailDTO {
+
+    @ApiModelProperty("航站楼编码")
+    private String terminlCode;
+
+    @ApiModelProperty("航站楼名称")
+    private String terminlName;
+
+    @ApiModelProperty("总人数")
+    private Integer openChannelCount;
+
+    @ApiModelProperty("在岗人数")
+    private Integer onDutyCount;
+
+    @ApiModelProperty("总通道数")
+    private Integer channelCount;
+
+    @ApiModelProperty("在岗通道数")
+    private Integer onDutyChannelCount;
+
+    @ApiModelProperty("航站楼下各个区域在岗详情")
+    private List<AttendanceRecordCountRegionDTO> region;
+
+    @ApiModelProperty("航站楼下各个班组待岗详情")
+    private List<AttendanceRecordCountWaitDTO> waitList;
+
+
+
+
+
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/enums/CheckInTypeEnum.java

@@ -0,0 +1,37 @@
+package com.sundot.airport.attendance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 打卡类型
+ *
+ * @Author: wangchong
+ * @Date: 2025/7/11 09:37
+ **/
+@AllArgsConstructor
+@Getter
+public enum CheckInTypeEnum {
+
+    CLOCK_IN(136, "上班", "CLOCK_IN"),
+    CLOCK_OUT(137, "下班", "CLOCK_OUT"),
+    POST_IN(138, "上岗", "POST_IN"),
+    POST_OUT(139, "下岗", "POST_OUT"),
+    ;
+
+    /**
+     * code
+     */
+    private final Integer code;
+
+    /**
+     * name
+     */
+    private final String name;
+
+    /**
+     * value
+     */
+    private final String value;
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/mapper/AttendanceAreaMapper.java

@@ -0,0 +1,26 @@
+package com.sundot.airport.attendance.mapper;
+
+import com.sundot.airport.attendance.domain.AttendanceArea;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+public interface AttendanceAreaMapper {
+
+    /**
+     *
+     * @param lng 用户经度
+     * @param lat 用户纬度
+     * @return 符合条件的考勤区域列表
+     */
+    List<AttendanceArea> findValidAreasEfficiently(
+            @Param("lng") BigDecimal lng,
+            @Param("lat") BigDecimal lat);
+
+    /**
+     * 查询考勤列表
+     * @return
+     */
+    List<AttendanceArea> areaList();
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/mapper/AttendanceCheckRecordMapper.java

@@ -0,0 +1,61 @@
+package com.sundot.airport.attendance.mapper;
+
+import com.sundot.airport.attendance.domain.AttendanceCheckRecord;
+
+import java.util.List;
+
+/**
+ * 打卡记录Mapper接口
+ *
+ * @author wangchong
+ * @date 2025-07-10
+ */
+public interface AttendanceCheckRecordMapper {
+    /**
+     * 查询打卡记录
+     *
+     * @param id 打卡记录主键
+     * @return 打卡记录
+     */
+    public AttendanceCheckRecord selectAttendanceCheckRecordById(Long id);
+
+    /**
+     * 查询打卡记录列表
+     *
+     * @param attendanceCheckRecord 打卡记录
+     * @return 打卡记录集合
+     */
+    public List<AttendanceCheckRecord> selectAttendanceCheckRecordList(AttendanceCheckRecord attendanceCheckRecord);
+
+    /**
+     * 新增打卡记录
+     *
+     * @param attendanceCheckRecord 打卡记录
+     * @return 结果
+     */
+    public int insertAttendanceCheckRecord(AttendanceCheckRecord attendanceCheckRecord);
+
+    /**
+     * 修改打卡记录
+     *
+     * @param attendanceCheckRecord 打卡记录
+     * @return 结果
+     */
+    public int updateAttendanceCheckRecord(AttendanceCheckRecord attendanceCheckRecord);
+
+    /**
+     * 删除打卡记录
+     *
+     * @param id 打卡记录主键
+     * @return 结果
+     */
+    public int deleteAttendanceCheckRecordById(Long id);
+
+    /**
+     * 批量删除打卡记录
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAttendanceCheckRecordByIds(Long[] ids);
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/mapper/AttendancePostRecordMapper.java

@@ -0,0 +1,135 @@
+package com.sundot.airport.attendance.mapper;
+
+import com.sundot.airport.attendance.domain.AttendancePostRecord;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 上岗记录Mapper接口
+ *
+ * @author wangchong
+ * @date 2025-07-10
+ */
+public interface AttendancePostRecordMapper {
+    /**
+     * 查询上岗记录
+     *
+     * @param id 上岗记录主键
+     * @return 上岗记录
+     */
+    public AttendancePostRecord selectAttendancePostRecordById(Long id);
+
+    /**
+     * 查询上岗记录列表
+     *
+     * @param attendancePostRecord 上岗记录
+     * @return 上岗记录集合
+     */
+    public List<AttendancePostRecord> selectAttendancePostRecordList(AttendancePostRecord attendancePostRecord);
+
+    /**
+     * 新增上岗记录
+     *
+     * @param attendancePostRecord 上岗记录
+     * @return 结果
+     */
+    public int insertAttendancePostRecord(AttendancePostRecord attendancePostRecord);
+
+    /**
+     * 修改上岗记录
+     *
+     * @param attendancePostRecord 上岗记录
+     * @return 结果
+     */
+    public int updateAttendancePostRecord(AttendancePostRecord attendancePostRecord);
+
+    /**
+     * 删除上岗记录
+     *
+     * @param id 上岗记录主键
+     * @return 结果
+     */
+    public int deleteAttendancePostRecordById(Long id);
+
+    /**
+     * 批量删除上岗记录
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAttendancePostRecordByIds(Long[] ids);
+
+    /**
+     * 查询指定用户当天的上岗记录
+     *
+     * @param userId 用户ID
+     * @param today 当天日期
+     * @return 上岗记录集合
+     */
+    public List<AttendancePostRecord> selectTodayRecordsByUserId(@Param("userId") Long userId, @Param("today") Date today);
+
+    /**
+     * 查询指定班次代码当天的上岗记录
+     *
+     * @param today 当天日期
+     * @param shiftCodes 班次代码列表
+     * @return 上岗记录集合
+     */
+    public List<AttendancePostRecord> selectTodayRecordsByShiftCodes(@Param("today") Date today, @Param("shiftCodes") List<String> shiftCodes);
+
+    /**
+     * 根据指定时间获取用户的在岗位置信息
+     *
+     * @param userId 用户ID
+     * @param queryTime 查询时间
+     * @return 上岗记录集合
+     */
+    public List<AttendancePostRecord> selectLocationsByTime(@Param("userId") Long userId, @Param("queryTime") Date queryTime);
+
+    /**
+     *  根据通道名称和指定时间获取通道的在岗位置信息
+     * @param channelCodeList 通道code
+     * @param queryTime 查询时间
+     * @return 上岗记录集合
+     */
+    List<AttendancePostRecord> selectLocationsByTimeAndChannelName(@Param("channelCodeList") List<String> channelCodeList, @Param("queryTime") Date queryTime, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
+
+    /**
+     *  查询指定班次代码的下班时间
+     * @param today
+     * @param shiftCodes
+     * @return
+     */
+    List<AttendancePostRecord> selectCheckOutTimeByShiftCodes(@Param("today") Date today, @Param("shiftCodes") List<String> shiftCodes);
+
+    /**
+     *
+     * @return
+     */
+    List<AttendancePostRecord> selectKezhangRecordCount(@Param("userId") Long userId, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
+
+    /**
+     * 查询指定用户指定时间最后的记录
+     * @param userId 用户ID
+     * @return 上岗记录集合
+     */
+    List<AttendancePostRecord> queryLastTime(@Param("userId") Long userId);
+
+    /**
+     *  查询指定时间段内所有考勤记录的ke_id
+     * @param startTime  开始时间
+     * @param endTime 结束时间
+     * @return
+     */
+    List<Long> queryKeIds(@Param("startTime")Date startTime, @Param("endTime") Date endTime);
+
+    /**
+     *  查询指定时间段内班组内所有考勤记录
+     * @param date
+     * @param attendanceTeamId
+     * @return
+     */
+    List<AttendancePostRecord> selectTeamOnList( @Param("date") Date date,@Param("attendanceTeamId") Long attendanceTeamId);
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/mapper/AttendanceRecordMapper.java

@@ -0,0 +1,61 @@
+package com.sundot.airport.attendance.mapper;
+
+import com.sundot.airport.attendance.domain.AttendanceRecord;
+
+import java.util.List;
+
+/**
+ * 考勤记录Mapper接口
+ *
+ * @author wangchong
+ * @date 2025-07-10
+ */
+public interface AttendanceRecordMapper {
+    /**
+     * 查询考勤记录
+     *
+     * @param id 考勤记录主键
+     * @return 考勤记录
+     */
+    public AttendanceRecord selectAttendanceRecordById(Long id);
+
+    /**
+     * 查询考勤记录列表
+     *
+     * @param attendanceRecord 考勤记录
+     * @return 考勤记录集合
+     */
+    public List<AttendanceRecord> selectAttendanceRecordList(AttendanceRecord attendanceRecord);
+
+    /**
+     * 新增考勤记录
+     *
+     * @param attendanceRecord 考勤记录
+     * @return 结果
+     */
+    public int insertAttendanceRecord(AttendanceRecord attendanceRecord);
+
+    /**
+     * 修改考勤记录
+     *
+     * @param attendanceRecord 考勤记录
+     * @return 结果
+     */
+    public int updateAttendanceRecord(AttendanceRecord attendanceRecord);
+
+    /**
+     * 删除考勤记录
+     *
+     * @param id 考勤记录主键
+     * @return 结果
+     */
+    public int deleteAttendanceRecordById(Long id);
+
+    /**
+     * 批量删除考勤记录
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAttendanceRecordByIds(Long[] ids);
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/mapper/AttendanceTeamUserRecordMapper.java

@@ -0,0 +1,74 @@
+package com.sundot.airport.attendance.mapper;
+
+import java.util.Date;
+import java.util.List;
+import com.sundot.airport.attendance.domain.AttendanceTeamUserRecord;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 考勤班组成员Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-09-06
+ */
+public interface AttendanceTeamUserRecordMapper 
+{
+    /**
+     * 查询考勤班组成员
+     * 
+     * @param userId 考勤班组成员主键
+     * @return 考勤班组成员
+     */
+    public AttendanceTeamUserRecord selectAttendanceTeamUserRecordByUserId(@Param("userId")  Long userId, @Param("attendanceDate") Date attendanceDate);
+
+    /**
+     * 查询考勤班组成员列表
+     * 
+     * @param attendanceTeamUserRecord 考勤班组成员
+     * @return 考勤班组成员集合
+     */
+    public List<AttendanceTeamUserRecord> selectAttendanceTeamUserRecordList(AttendanceTeamUserRecord attendanceTeamUserRecord);
+
+    /**
+     * 新增考勤班组成员
+     * 
+     * @param attendanceTeamUserRecord 考勤班组成员
+     * @return 结果
+     */
+    public int insertAttendanceTeamUserRecord(AttendanceTeamUserRecord attendanceTeamUserRecord);
+
+    /**
+     * 修改考勤班组成员
+     * 
+     * @param attendanceTeamUserRecord 考勤班组成员
+     * @return 结果
+     */
+    public int updateAttendanceTeamUserRecord(AttendanceTeamUserRecord attendanceTeamUserRecord);
+
+    /**
+     * 删除考勤班组成员
+     * 
+     * @param userId 考勤班组成员主键
+     * @return 结果
+     */
+    public int deleteAttendanceTeamUserRecordByUserId(Long userId);
+
+    /**
+     * 批量删除考勤班组成员
+     * 
+     * @param userIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAttendanceTeamUserRecordByUserIds(Long[] userIds);
+
+    int insertAttendanceTeamUserRecordList(List<AttendanceTeamUserRecord> attendanceTeamUserRecord);
+    /**
+     * 根据用户ID和时间范围查询考勤班组成员
+     *
+     * @param userId 用户ID
+     * @param startDate 开始日期
+     * @param endDate 结束日期
+     * @return 考勤班组成员列表
+     */
+    List<AttendanceTeamUserRecord> selectAttendanceTeamUserRecordByUserIdAndDateRange(Long userId, Date startDate, Date endDate);
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/portrait/AttendanceModuleIndicatorResult.java

@@ -0,0 +1,32 @@
+package com.sundot.airport.attendance.portrait;
+
+import com.sundot.airport.attendance.domain.portrait.StationDeptWorkStats;
+import com.sundot.airport.common.domain.portrait.BaseModuleIndicatorResult;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 考勤模块指标结果类
+ * 用于存储考勤模块的指标数据
+ */
+@Data
+public class AttendanceModuleIndicatorResult extends BaseModuleIndicatorResult {
+    
+    /** 出勤天数 */
+    @ApiModelProperty(value = "出勤天数")
+    private Object workingDate;
+    
+    /** 上岗时长 */
+    @ApiModelProperty(value = "出勤天数")
+    private Object workingHours;
+
+    /** 站的统计列表 */
+    @ApiModelProperty(value = "出勤天数")
+    private List<StationDeptWorkStats> stationDeptWorkStats;
+    
+    public AttendanceModuleIndicatorResult() {
+        setModuleName("attendance");
+    }
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/portrait/AttendanceModuleIndicatorService.java

@@ -0,0 +1,86 @@
+package com.sundot.airport.attendance.portrait;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.sundot.airport.attendance.domain.AttendancePostRecord;
+import com.sundot.airport.attendance.domain.AttendanceRecord;
+import com.sundot.airport.attendance.domain.portrait.StationDeptWorkStats;
+import com.sundot.airport.attendance.mapper.AttendancePostRecordMapper;
+import com.sundot.airport.attendance.mapper.AttendanceRecordMapper;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.domain.portrait.IndicatorCalculateParams;
+import com.sundot.airport.common.enums.DeptTypeEnum;
+import com.sundot.airport.common.enums.portrait.IndicatorType;
+import com.sundot.airport.common.enums.portrait.UserType;
+import com.sundot.airport.common.service.portrait.AbstractModuleIndicatorService;
+import com.sundot.airport.common.service.portrait.Indicator;
+import com.sundot.airport.system.service.ISysDeptService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.math.BigDecimal;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.stream.Collectors;
+import javax.annotation.PostConstruct;
+
+/**
+ * 考勤模块指标服务实现
+ * 处理考勤相关的指标计算
+ */
+@Service
+public class AttendanceModuleIndicatorService extends AbstractModuleIndicatorService<AttendanceModuleIndicatorResult> {
+    
+    @Autowired
+    private Set<Indicator<?>> indicators;
+    
+    @Autowired
+    private AttendanceRecordMapper attendanceRecordMapper;
+
+    @Autowired
+    private AttendancePostRecordMapper attendancePostRecordMapper;
+
+    @Autowired
+    private ISysDeptService sysDeptService;
+    
+    private Set<IndicatorType> supportedIndicatorTypes = new HashSet<>();
+    
+    @Override
+    public String getModuleName() {
+        return "attendance";
+    }
+    
+    @PostConstruct
+    public void initSupportedIndicatorTypes() {
+        // 初始化支持的指标类型
+        if (indicators != null) {
+            for (Indicator<?> indicator : indicators) {
+                IndicatorType type = IndicatorType.fromCode(indicator.getName());
+                if (type != null && !supportedIndicatorTypes.contains(type) && type.getModule().equals(getModuleName())) {
+                    supportedIndicatorTypes.add(type);
+                }
+            }
+        }
+    }
+    
+    @Override
+    protected AttendanceModuleIndicatorResult createResult() {
+        return new AttendanceModuleIndicatorResult();
+    }
+    
+    @Override
+    protected Set<IndicatorType> getSupportedIndicatorTypes() {
+        return supportedIndicatorTypes;
+    }
+    
+    @Override
+    protected Set<Indicator<?>> getIndicators() {
+        return indicators;
+    }
+    
+    @Override
+    protected void setIndicatorResult(Indicator<?> indicator, AttendanceModuleIndicatorResult result) {
+        // 直接调用指标的setResult方法，将值设置到结果对象中
+        indicator.setResult(result);
+    }
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/portrait/StationWorkStatsService.java

@@ -0,0 +1,160 @@
+package com.sundot.airport.attendance.portrait;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+import com.sundot.airport.attendance.domain.portrait.StationDeptWorkStats;
+import com.sundot.airport.attendance.domain.portrait.WorkDateStats;
+import com.sundot.airport.attendance.domain.portrait.WorkHoursStats;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.core.domain.entity.SysUser;
+import com.sundot.airport.common.domain.portrait.IndicatorCalculateParams;
+import com.sundot.airport.common.domain.portrait.ModularIndicatorResult;
+import com.sundot.airport.common.enums.DeptTypeEnum;
+import com.sundot.airport.common.enums.RoleTypeEnum;
+import com.sundot.airport.common.enums.portrait.UserType;
+import com.sundot.airport.system.service.ISysDeptService;
+import com.sundot.airport.system.service.ISysUserService;
+import com.sundot.airport.system.service.portrait.UserPortraitService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/**
+ * 站级工作统计服务
+ * 专门处理考勤模块中站级部门的特殊统计逻辑
+ */
+@Service
+public class StationWorkStatsService {
+
+    
+    @Autowired
+    private ISysDeptService sysDeptService;
+
+    @Autowired
+    private UserPortraitService userPortraitService;
+
+    @Autowired
+    private ISysUserService iSysUserService;
+    
+    /**
+     * 计算站级部门及其下属部门的工作统计数据
+     * @param params 指定部门
+     * @return 工作统计数据列表
+     */
+    public List<StationDeptWorkStats> calculateStationWorkStats(IndicatorCalculateParams params) {
+        Long stationId = params.getDeptId();
+        if (stationId == null) {
+            return null;
+        }
+
+        // 直接查询部门信息
+        SysDept queryDept = new SysDept();
+        queryDept.setDeptId(stationId);
+        queryDept.setDeptType(DeptTypeEnum.DEPARTMENT.getCode());
+        List<SysDept> sysDeptList = sysDeptService.selectDeptInfo(queryDept);
+        
+        if (CollectionUtil.isEmpty(sysDeptList)) {
+            return null;
+        }
+        IndicatorCalculateParams indicatorCalculateParams = this.appendParams(params);
+        // 为每个部门生成统计信息
+        return sysDeptList.stream()
+                .map(dept -> getStationDeptWorkStats( dept,indicatorCalculateParams))
+                .filter(java.util.Objects::nonNull)
+                .collect(Collectors.toList());
+    }
+
+    private IndicatorCalculateParams appendParams(IndicatorCalculateParams dto) {
+        IndicatorCalculateParams params = new IndicatorCalculateParams();
+        params.setIndicatorTypes(Arrays.asList("qualificationLevel", "workingDate", "workingHours", "effectiveSeizureCount", "workYears", "securityWorkYears"));
+        // 设置默认时间范围
+        java.util.Date endTime = Optional.ofNullable(dto.getEndTime()).orElse(new java.util.Date());
+        java.util.Date startTime = Optional.ofNullable(dto.getStartTime())
+                .orElse(java.util.Date.from(endTime.toInstant().minusSeconds(7862400L))); // 91天
+
+        params.setStartTime(startTime);
+        params.setEndTime(endTime);
+        return params;
+    }
+    
+    /**
+     * 为特定部门生成工作统计信息
+     * @param dept 部门信息
+     * @return 部门工作统计信息
+     */
+    private StationDeptWorkStats getStationDeptWorkStats(SysDept dept, IndicatorCalculateParams indicatorCalculateParams) {
+        if (dept == null) {
+            return null;
+        }
+        
+        StationDeptWorkStats stationStats = new StationDeptWorkStats();
+        stationStats.setDimension(dept.getDeptName());
+        stationStats.setDeptId(dept.getDeptId());
+        stationStats.setDeptName(dept.getDeptName());
+
+        indicatorCalculateParams.setUserType(StrUtil.equals(DeptTypeEnum.STATION.getCode(), dept.getDeptType()) ? UserType.STATION : UserType.DEPARTMENT);
+
+
+        //获取指标
+        indicatorCalculateParams.setDeptId(dept.getDeptId());
+        List<SysUser> sysUsers = iSysUserService.selectUserListByRoleKeyAndDeptId(Arrays.asList(RoleTypeEnum.banzuzhang.getCode(), RoleTypeEnum.SecurityCheck.getCode()), dept.getDeptId());
+        indicatorCalculateParams.setUserIds(sysUsers.stream().map(SysUser::getUserId).collect(Collectors.toList()));
+        // 计算人均出勤天数
+        stationStats.setAvgWorkingDays(avgWorkingDays(indicatorCalculateParams));
+
+        // 计算人均上岗时长
+        stationStats.setAvgWorkingHours(avgWorkingHours(indicatorCalculateParams));
+
+        return stationStats;
+    }
+
+
+    private BigDecimal  avgWorkingDays(IndicatorCalculateParams params) {
+        BigDecimal avgWorkingDays = BigDecimal.ZERO;
+                ModularIndicatorResult indicators = userPortraitService.getIndicators(params, Arrays.asList("attendance"));
+        if (indicators == null) {
+            return avgWorkingDays;
+        }
+
+        AttendanceModuleIndicatorResult attendanceResult = (AttendanceModuleIndicatorResult) indicators.getModuleResult("attendance");
+        if (attendanceResult == null) {
+            return avgWorkingDays;
+        }
+
+        Object workingDate = attendanceResult.getWorkingDate();
+        if (workingDate instanceof WorkDateStats) {
+            WorkDateStats workDateStats = (WorkDateStats) workingDate;
+             avgWorkingDays =    workDateStats.getAveragePersonnel() != null ?
+                    workDateStats.getAveragePersonnel() : BigDecimal.ZERO;
+        }
+        return avgWorkingDays;
+    }
+
+
+    private BigDecimal avgWorkingHours(IndicatorCalculateParams params) {
+        BigDecimal avgWorkingHours = BigDecimal.ZERO;
+        ModularIndicatorResult indicators = userPortraitService.getIndicators(params, Arrays.asList("attendance"));
+        if (indicators == null) {
+            return avgWorkingHours;
+        }
+
+        AttendanceModuleIndicatorResult attendanceResult = (AttendanceModuleIndicatorResult) indicators.getModuleResult("attendance");
+        if (attendanceResult == null) {
+            return avgWorkingHours;
+        }
+        Object workingHours = attendanceResult.getWorkingHours();
+        if (workingHours instanceof WorkHoursStats) {
+            WorkHoursStats workHoursStats = (WorkHoursStats) workingHours;
+            avgWorkingHours=workHoursStats.getAveragePersonnel() != null ?
+                    workHoursStats.getAveragePersonnel() : BigDecimal.ZERO;
+        }
+
+        return avgWorkingHours;
+    }
+
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/portrait/WorkingDateIndicator.java

@@ -0,0 +1,98 @@
+package com.sundot.airport.attendance.portrait;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.sundot.airport.attendance.domain.AttendanceRecord;
+import com.sundot.airport.attendance.mapper.AttendanceRecordMapper;
+import com.sundot.airport.common.domain.portrait.BaseModuleIndicatorResult;
+import com.sundot.airport.common.domain.portrait.IndicatorCalculateParams;
+import com.sundot.airport.attendance.domain.portrait.WorkDateStats;
+import com.sundot.airport.common.enums.portrait.IndicatorType;
+import com.sundot.airport.common.enums.portrait.UserType;
+import com.sundot.airport.common.service.portrait.Indicator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 出勤天数
+ * 个人：周期内出勤天数
+ * 组织：周期内出勤总天数/平均人数
+ */
+@Component
+public class WorkingDateIndicator implements Indicator<Object> {
+    
+    @Autowired
+    private AttendanceRecordMapper attendanceRecordMapper;
+    
+    private Object value;
+    
+    @Override
+    public String getName() {
+        return IndicatorType.WORKING_DATE.getCode();
+    }
+
+    @Override
+    public Object getValue() {
+        return value;
+    }
+
+    @Override
+    public void calculate(IndicatorCalculateParams params) {
+        Long userId = params.getUserId();
+        UserType userType = params.getUserType();
+        if (UserType.PERSONAL.equals(userType)) {
+            // 个人：周期内出勤天数
+            AttendanceRecord record = new AttendanceRecord();
+            record.setUserId(userId);
+            record.setAttendanceDateStart(params.getStartTime());
+            record.setAttendanceDateEnd(params.getEndTime());
+            List<AttendanceRecord> records = attendanceRecordMapper.selectAttendanceRecordList(record);
+            this.value = records.size();
+        } else {
+            // 组织：周期内出勤总天数/平均人数
+            WorkDateStats stats = new WorkDateStats();
+
+            // 部门id
+            Long deptId = params.getDeptId();
+
+            // 查询该部门下所有用户的考勤记录
+            AttendanceRecord record = new AttendanceRecord();
+            switch (userType) {
+                case TEAM:
+                    record.setTeamCode(deptId.toString());
+                    break;
+                case DEPARTMENT:
+                    record.setDepartmentCode(deptId.toString());
+                    break;
+                case STATION:
+                    record.setStationCode(deptId.toString());
+                    break;
+                default:
+                    break;
+            }
+            record.setAttendanceDateStart(params.getStartTime());
+            record.setAttendanceDateEnd(params.getEndTime());
+
+            List<AttendanceRecord> records = attendanceRecordMapper.selectAttendanceRecordList(record);
+
+            // 计算总出勤天数
+            int totalWorkingDays = records.size();
+
+
+            stats.setTotalWorkingDays(totalWorkingDays);
+            stats.setAveragePersonnel(CollectionUtil.isNotEmpty(params.getUserIds()) ? new BigDecimal(totalWorkingDays).divide(new BigDecimal(params.getUserIds().size()), 2, BigDecimal.ROUND_HALF_UP) : BigDecimal.ZERO);
+
+            this.value = stats;
+        }
+    }
+
+    @Override
+    public void setResult(BaseModuleIndicatorResult result) {
+        if (result instanceof AttendanceModuleIndicatorResult) {
+            AttendanceModuleIndicatorResult attendanceResult = (AttendanceModuleIndicatorResult) result;
+            attendanceResult.setWorkingDate(this.value);
+        }
+    }
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/portrait/WorkingHoursIndicator.java

@@ -0,0 +1,106 @@
+package com.sundot.airport.attendance.portrait;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.sundot.airport.attendance.domain.AttendancePostRecord;
+import com.sundot.airport.attendance.mapper.AttendancePostRecordMapper;
+import com.sundot.airport.common.domain.portrait.BaseModuleIndicatorResult;
+import com.sundot.airport.common.domain.portrait.IndicatorCalculateParams;
+import com.sundot.airport.attendance.domain.portrait.WorkHoursStats;
+import com.sundot.airport.common.enums.portrait.IndicatorType;
+import com.sundot.airport.common.enums.portrait.UserType;
+import com.sundot.airport.common.service.portrait.Indicator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 上岗时长
+ * 个人：周期内上岗时数
+ * 组织：周期内上岗总时数/平均人数
+ */
+@Component
+public class WorkingHoursIndicator implements Indicator<Object> {
+
+    @Autowired
+    private AttendancePostRecordMapper attendancePostRecordMapper;
+
+    private Object value;
+
+    @Override
+    public String getName() {
+        return IndicatorType.WORKING_HOURS.getCode();
+    }
+
+    @Override
+    public Object getValue() {
+        return value;
+    }
+
+    @Override
+    public void calculate(IndicatorCalculateParams params) {
+        Long userId = params.getUserId();
+        UserType userType = params.getUserType();
+        if (UserType.PERSONAL.equals(userType)) {
+            // 个人：周期内上岗时数（分钟）
+            AttendancePostRecord record = new AttendancePostRecord();
+            record.setUserId(userId);
+            record.setCheckInTimeStart(params.getStartTime());
+            record.setCheckInTimeEnd(params.getEndTime());
+            List<AttendancePostRecord> records = attendancePostRecordMapper.selectAttendancePostRecordList(record);
+
+            // 计算总工作时长
+            long totalWorkingHours = records.stream()
+                    .mapToLong(AttendancePostRecord::getWorkDuration)
+                    .filter(workDuration -> workDuration > 0)
+                    .sum();
+            totalWorkingHours = totalWorkingHours > 0 ? totalWorkingHours / 60 : 0;
+            this.value = totalWorkingHours;
+        } else {
+            // 组织：周期内上岗总时数/平均人数
+            WorkHoursStats stats = new WorkHoursStats();
+
+            // 部门id
+            Long deptId = params.getDeptId();
+
+            // 查询部门下所有用户的上岗记录
+            AttendancePostRecord record = new AttendancePostRecord();
+            switch (userType) {
+                case TEAM:
+                    record.setAttendanceTeamId(deptId);
+                    break;
+                case DEPARTMENT:
+                    record.setAttendanceDepartmentId(deptId);
+                    break;
+                case STATION:
+                    record.setAttendanceStationId(deptId);
+                    break;
+                default:
+                    break;
+            }
+            record.setCheckInTimeStart(params.getStartTime());
+            record.setCheckInTimeEnd(params.getEndTime());
+            List<AttendancePostRecord> records = attendancePostRecordMapper.selectAttendancePostRecordList(record);
+
+            // 计算总工作时长
+            long totalWorkingHours = records.stream()
+                    .mapToLong(AttendancePostRecord::getWorkDuration)
+                    .filter(workDuration -> workDuration > 0)
+                    .sum();
+            totalWorkingHours = totalWorkingHours > 0 ? totalWorkingHours / 60 : 0;
+            
+            stats.setTotalWorkingHours(totalWorkingHours);
+            stats.setAveragePersonnel(CollectionUtil.isNotEmpty(params.getUserIds())? new BigDecimal(totalWorkingHours).divide(new BigDecimal(params.getUserIds().size()), 2, BigDecimal.ROUND_HALF_UP) : BigDecimal.ZERO);
+            this.value = stats;
+        }
+    }
+    
+    @Override
+    public void setResult(BaseModuleIndicatorResult result) {
+        if (result instanceof AttendanceModuleIndicatorResult) {
+            AttendanceModuleIndicatorResult attendanceResult = (AttendanceModuleIndicatorResult) result;
+            attendanceResult.setWorkingHours(this.value);
+        }
+    }
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/service/AttendanceAreaService.java

@@ -0,0 +1,23 @@
+package com.sundot.airport.attendance.service;
+
+import com.sundot.airport.attendance.domain.AttendanceArea;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+public interface AttendanceAreaService {
+    /**
+     *
+     * 查询是否在考勤范围
+     * @param lng 经度
+     * @param lat 纬度
+     * @return
+     */
+    List<AttendanceArea> checkUserInValidArea(BigDecimal lng, BigDecimal lat);
+
+    /**
+     *
+     * @return
+     */
+    List<AttendanceArea> areaList();
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/service/IAttendanceCheckRecordService.java

@@ -0,0 +1,61 @@
+package com.sundot.airport.attendance.service;
+
+import com.sundot.airport.attendance.domain.AttendanceCheckRecord;
+
+import java.util.List;
+
+/**
+ * 打卡记录Service接口
+ *
+ * @author wangchong
+ * @date 2025-07-10
+ */
+public interface IAttendanceCheckRecordService {
+    /**
+     * 查询打卡记录
+     *
+     * @param id 打卡记录主键
+     * @return 打卡记录
+     */
+    public AttendanceCheckRecord selectAttendanceCheckRecordById(Long id);
+
+    /**
+     * 查询打卡记录列表
+     *
+     * @param attendanceCheckRecord 打卡记录
+     * @return 打卡记录集合
+     */
+    public List<AttendanceCheckRecord> selectAttendanceCheckRecordList(AttendanceCheckRecord attendanceCheckRecord);
+
+    /**
+     * 新增打卡记录
+     *
+     * @param attendanceCheckRecord 打卡记录
+     * @return 结果
+     */
+    public int insertAttendanceCheckRecord(AttendanceCheckRecord attendanceCheckRecord);
+
+    /**
+     * 修改打卡记录
+     *
+     * @param attendanceCheckRecord 打卡记录
+     * @return 结果
+     */
+    public int updateAttendanceCheckRecord(AttendanceCheckRecord attendanceCheckRecord);
+
+    /**
+     * 批量删除打卡记录
+     *
+     * @param ids 需要删除的打卡记录主键集合
+     * @return 结果
+     */
+    public int deleteAttendanceCheckRecordByIds(Long[] ids);
+
+    /**
+     * 删除打卡记录信息
+     *
+     * @param id 打卡记录主键
+     * @return 结果
+     */
+    public int deleteAttendanceCheckRecordById(Long id);
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/service/IAttendancePostRecordService.java

@@ -0,0 +1,136 @@
+package com.sundot.airport.attendance.service;
+
+import com.sundot.airport.attendance.domain.AttendancePostRecord;
+import com.sundot.airport.attendance.dto.AttendanceRecordCountDTO;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 上岗记录Service接口
+ *
+ * @author wangchong
+ * @date 2025-07-10
+ */
+public interface IAttendancePostRecordService {
+    /**
+     * 查询上岗记录
+     *
+     * @param id 上岗记录主键
+     * @return 上岗记录
+     */
+    public AttendancePostRecord selectAttendancePostRecordById(Long id);
+
+    /**
+     * 查询上岗记录列表
+     *
+     * @param attendancePostRecord 上岗记录
+     * @return 上岗记录集合
+     */
+    public List<AttendancePostRecord> selectAttendancePostRecordList(AttendancePostRecord attendancePostRecord);
+
+    /**
+     * 新增上岗记录
+     *
+     * @param attendancePostRecord 上岗记录
+     * @return 结果
+     */
+    public int insertAttendancePostRecord(AttendancePostRecord attendancePostRecord);
+
+    /**
+     * 修改上岗记录
+     *
+     * @param attendancePostRecord 上岗记录
+     * @return 结果
+     */
+    public int updateAttendancePostRecord(AttendancePostRecord attendancePostRecord);
+
+    /**
+     * 批量删除上岗记录
+     *
+     * @param ids 需要删除的上岗记录主键集合
+     * @return 结果
+     */
+    public int deleteAttendancePostRecordByIds(Long[] ids);
+
+    /**
+     * 删除上岗记录信息
+     *
+     * @param id 上岗记录主键
+     * @return 结果
+     */
+    public int deleteAttendancePostRecordById(Long id);
+
+    /**
+     * 查询指定用户当天的上岗记录
+     *
+     * @param userId 用户ID
+     * @param today 当天日期
+     * @return 上岗记录集合
+     */
+    public List<AttendancePostRecord> selectTodayRecordsByUserId(Long userId, Date today);
+
+    /**
+     * 查询指定班次代码当天的上岗记录
+     *
+     * @param today 当天日期
+     * @param shiftCodes 班次代码列表
+     * @return 上岗记录集合
+     */
+    public List<AttendancePostRecord> selectTodayRecordsByShiftCodes(Date today, List<String> shiftCodes);
+
+    /**
+     * 根据指定时间获取用户的在岗位置信息
+     *
+     * @param userId 用户ID
+     * @param queryTime 查询时间
+     * @return 上岗记录集合
+     */
+    public List<AttendancePostRecord> selectLocationsByTime(Long userId, Date queryTime);
+
+    /**
+     * 根据指定时间获取指定通道的在岗位置信息
+     *
+     * @param channelCodeList 通道code
+     * @return 上岗记录集合
+     */
+    List<AttendancePostRecord> selectLocationsByTimeAndChannelName(List<String> channelCodeList, Date nowDate,Date startTime,Date endTime);
+
+    /**
+     * 查询指定班次代码当天的下岗记录
+     * @param today
+     * @param shiftCodes
+     * @return
+     */
+    public List<AttendancePostRecord> selectCheckOutTimeByShiftCodes(Date today, List<String> shiftCodes);
+
+    /**
+     *  获取当前时间下科长的在岗区域
+     * @return 区域集合
+     */
+    List<AttendancePostRecord> selectKezhangRecordCount(Long userId,Date startTime,Date endTime);
+
+    /**
+     * 获取当前时间下指定用户最后的在岗时间
+     * @param userId 用户ID
+     * @return 最后的在岗时间
+     */
+    List<AttendancePostRecord>  queryLastTime(Long userId);
+
+    /**
+     * 获取当前班次下科长上岗的id
+     * @return
+     */
+    List<Long> queryKeIds();
+    /**
+     * 查询当前班组下所有在岗记录
+     */
+    List<AttendancePostRecord>  selectTeamOnList(Date date, Long attendanceTeamId);
+
+    /**
+     * 获取当前班次时间
+     * @return  时间
+     */
+    Map<String, Date> getShiftTime();
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/service/IAttendanceRecordService.java

@@ -0,0 +1,94 @@
+package com.sundot.airport.attendance.service;
+
+import com.sundot.airport.attendance.domain.AttendanceCheckRecord;
+import com.sundot.airport.attendance.domain.AttendanceRecord;
+import com.sundot.airport.common.dto.AttendanceRecordDTO;
+import com.sundot.airport.common.dto.AttendanceRecordRep;
+import com.sundot.airport.common.dto.AttendanceRecordReq;
+import com.sundot.airport.common.dto.UserInfo;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 考勤记录Service接口
+ *
+ * @author wangchong
+ * @date 2025-07-10
+ */
+public interface IAttendanceRecordService {
+    /**
+     * 查询考勤记录
+     *
+     * @param id 考勤记录主键
+     * @return 考勤记录
+     */
+    public AttendanceRecord selectAttendanceRecordById(Long id);
+
+    /**
+     * 查询考勤记录列表
+     *
+     * @param attendanceRecord 考勤记录
+     * @return 考勤记录集合
+     */
+    public List<AttendanceRecord> selectAttendanceRecordList(AttendanceRecord attendanceRecord);
+
+    /**
+     * 新增考勤记录
+     *
+     * @param attendanceRecord 考勤记录
+     * @return 结果
+     */
+    public int insertAttendanceRecord(AttendanceRecord attendanceRecord);
+
+    /**
+     * 修改考勤记录
+     *
+     * @param attendanceRecord 考勤记录
+     * @return 结果
+     */
+    public int updateAttendanceRecord(AttendanceRecord attendanceRecord);
+
+    /**
+     * 批量删除考勤记录
+     *
+     * @param ids 需要删除的考勤记录主键集合
+     * @return 结果
+     */
+    public int deleteAttendanceRecordByIds(Long[] ids);
+
+    /**
+     * 删除考勤记录信息
+     *
+     * @param id 考勤记录主键
+     * @return 结果
+     */
+    public int deleteAttendanceRecordById(Long id);
+
+    /**
+     * 打卡签到
+     *
+     * @param dto      打卡信息
+     * @param userInfo 登录用户
+     * @return 今日打卡历史
+     */
+    List<AttendanceCheckRecord> record(AttendanceRecordDTO dto, UserInfo userInfo);
+
+    /**
+     * 获取打卡记录
+     *
+     * @param dto 打卡记录参数
+     * @return 打卡记录
+     */
+    List<AttendanceRecordRep> recordList(AttendanceRecordReq dto);
+
+    /**
+     * 计算考勤日期
+     * @param checkInTime 实际打卡时间，即员工实际进行打卡操作的时间点
+     * @param shiftStartTime 班次开始时间，格式为 "HH:mm"，如 "21:00" 表示晚上9点
+     * @param shiftEndTime 班次结束时间，格式为 "HH:mm"，如 "21:00" 表示晚上9点
+     * @param checkInType  1-上班打卡，2-下班打卡
+     * @return 计算出的考勤日期，表示该次打卡记录应归属的考勤周期日期
+     */
+    Date calculateAttendanceDate(Date checkInTime, String shiftStartTime, String shiftEndTime,String checkInType);
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/service/IAttendanceTeamUserRecordService.java

@@ -0,0 +1,84 @@
+package com.sundot.airport.attendance.service;
+
+import java.util.Date;
+import java.util.List;
+import com.sundot.airport.attendance.domain.AttendanceTeamUserRecord;
+
+/**
+ * 考勤班组成员Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-09-06
+ */
+public interface IAttendanceTeamUserRecordService 
+{
+    /**
+     * 查询考勤班组成员
+     * 
+     * @param userId 考勤班组成员主键
+     * @return 考勤班组成员
+     */
+    public AttendanceTeamUserRecord selectAttendanceTeamUserRecordByUserId(Long userId, Date attendanceDate);
+
+    /**
+     * 查询考勤班组成员列表
+     * @param attendanceTeamUserRecord
+     * @return
+     */
+
+    List<AttendanceTeamUserRecord> selectAttendanceTeamUserRecordPageList(AttendanceTeamUserRecord attendanceTeamUserRecord);
+
+    /**
+     * 上岗记录中查询考勤班组成员列表
+     * 
+     * @param attendanceTeamUserRecord 考勤班组成员
+     * @return 考勤班组成员集合
+     */
+    public List<AttendanceTeamUserRecord> selectAttendanceTeamUserRecordList(AttendanceTeamUserRecord attendanceTeamUserRecord);
+
+    /**
+     * 新增考勤班组成员
+     * 
+     * @param attendanceTeamUserRecord 考勤班组成员
+     * @return 结果
+     */
+    public int insertAttendanceTeamUserRecord(AttendanceTeamUserRecord attendanceTeamUserRecord);
+
+    /**
+     * 修改考勤班组成员
+     * 
+     * @param attendanceTeamUserRecord 考勤班组成员
+     * @return 结果
+     */
+    public int updateAttendanceTeamUserRecord(AttendanceTeamUserRecord attendanceTeamUserRecord);
+
+    /**
+     * 批量删除考勤班组成员
+     * 
+     * @param userIds 需要删除的考勤班组成员主键集合
+     * @return 结果
+     */
+    public int deleteAttendanceTeamUserRecordByUserIds(Long[] userIds);
+
+    /**
+     * 删除考勤班组成员信息
+     * 
+     * @param userId 考勤班组成员主键
+     * @return 结果
+     */
+    public int deleteAttendanceTeamUserRecordByUserId(Long userId);
+
+    /**
+     *  批量新增考勤班组成员
+     * @param attendanceTeamUserRecord
+     * @return
+     */
+    int insertAttendanceTeamUserRecordList(List<AttendanceTeamUserRecord> attendanceTeamUserRecord);
+
+    /**
+     * 查询考勤班组组长id
+     */
+    List<Long> selectAttendanceTeamLeaderId();
+
+
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/service/impl/AttendanceAreaServiceImpl.java

@@ -0,0 +1,52 @@
+package com.sundot.airport.attendance.service.impl;
+
+import com.sundot.airport.attendance.domain.AttendanceArea;
+import com.sundot.airport.attendance.mapper.AttendanceAreaMapper;
+import com.sundot.airport.attendance.service.AttendanceAreaService;
+import com.sundot.airport.common.exception.ServiceException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Service
+public class AttendanceAreaServiceImpl implements AttendanceAreaService {
+    @Autowired
+    private AttendanceAreaMapper attendanceAreaMapper;
+
+    /**
+     * 查询是否在考勤范围
+     * @param lng 经度
+     * @param lat 纬度
+     * @return
+     */
+    @Override
+    public List<AttendanceArea> checkUserInValidArea(BigDecimal lng, BigDecimal lat) {
+        // 验证经纬度有效性
+        if (lng == null || lat == null) {
+            throw new ServiceException("经纬度不能为空");
+        }
+
+        // 检查经纬度范围（经度：-180到180，纬度：-90到90）
+        if (lng.compareTo(new BigDecimal("-180")) < 0 ||
+                lng.compareTo(new BigDecimal("180")) > 0) {
+            throw new ServiceException("经度必须在-180到180之间");
+        }
+
+        if (lat.compareTo(new BigDecimal("-90")) < 0 ||
+                lat.compareTo(new BigDecimal("90")) > 0) {
+            throw new ServiceException("纬度必须在-90到90之间");
+        }
+        return attendanceAreaMapper.findValidAreasEfficiently(lng, lat);
+    }
+
+    /**
+     * 查询所有的考勤范围点
+     * @return
+     */
+    @Override
+    public List<AttendanceArea> areaList() {
+        return attendanceAreaMapper.areaList();
+    }
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/service/impl/AttendanceCheckRecordServiceImpl.java

@@ -0,0 +1,90 @@
+package com.sundot.airport.attendance.service.impl;
+
+import com.sundot.airport.attendance.domain.AttendanceCheckRecord;
+import com.sundot.airport.attendance.mapper.AttendanceCheckRecordMapper;
+import com.sundot.airport.attendance.service.IAttendanceCheckRecordService;
+import com.sundot.airport.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 打卡记录Service业务层处理
+ *
+ * @author wangchong
+ * @date 2025-07-10
+ */
+@Service
+public class AttendanceCheckRecordServiceImpl implements IAttendanceCheckRecordService {
+    @Autowired
+    private AttendanceCheckRecordMapper attendanceCheckRecordMapper;
+
+    /**
+     * 查询打卡记录
+     *
+     * @param id 打卡记录主键
+     * @return 打卡记录
+     */
+    @Override
+    public AttendanceCheckRecord selectAttendanceCheckRecordById(Long id) {
+        return attendanceCheckRecordMapper.selectAttendanceCheckRecordById(id);
+    }
+
+    /**
+     * 查询打卡记录列表
+     *
+     * @param attendanceCheckRecord 打卡记录
+     * @return 打卡记录
+     */
+    @Override
+    public List<AttendanceCheckRecord> selectAttendanceCheckRecordList(AttendanceCheckRecord attendanceCheckRecord) {
+        return attendanceCheckRecordMapper.selectAttendanceCheckRecordList(attendanceCheckRecord);
+    }
+
+    /**
+     * 新增打卡记录
+     *
+     * @param attendanceCheckRecord 打卡记录
+     * @return 结果
+     */
+    @Override
+    public int insertAttendanceCheckRecord(AttendanceCheckRecord attendanceCheckRecord) {
+        attendanceCheckRecord.setCreateTime(DateUtils.getNowDate());
+        return attendanceCheckRecordMapper.insertAttendanceCheckRecord(attendanceCheckRecord);
+    }
+
+    /**
+     * 修改打卡记录
+     *
+     * @param attendanceCheckRecord 打卡记录
+     * @return 结果
+     */
+    @Override
+    public int updateAttendanceCheckRecord(AttendanceCheckRecord attendanceCheckRecord) {
+        attendanceCheckRecord.setUpdateTime(DateUtils.getNowDate());
+        return attendanceCheckRecordMapper.updateAttendanceCheckRecord(attendanceCheckRecord);
+    }
+
+    /**
+     * 批量删除打卡记录
+     *
+     * @param ids 需要删除的打卡记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAttendanceCheckRecordByIds(Long[] ids) {
+        return attendanceCheckRecordMapper.deleteAttendanceCheckRecordByIds(ids);
+    }
+
+    /**
+     * 删除打卡记录信息
+     *
+     * @param id 打卡记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAttendanceCheckRecordById(Long id) {
+        return attendanceCheckRecordMapper.deleteAttendanceCheckRecordById(id);
+    }
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/service/impl/AttendancePostRecordServiceImpl.java

@@ -0,0 +1,269 @@
+package com.sundot.airport.attendance.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.sundot.airport.attendance.domain.AttendancePostRecord;
+import com.sundot.airport.attendance.mapper.AttendancePostRecordMapper;
+import com.sundot.airport.attendance.service.IAttendancePostRecordService;
+import com.sundot.airport.common.utils.DateUtils;
+import com.sundot.airport.common.utils.StringUtils;
+import com.sundot.airport.system.service.ISysConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 上岗记录Service业务层处理
+ *
+ * @author wangchong
+ * @date 2025-07-10
+ */
+@Service
+public class AttendancePostRecordServiceImpl implements IAttendancePostRecordService {
+    @Autowired
+    private AttendancePostRecordMapper attendancePostRecordMapper;
+
+    @Autowired
+    private ISysConfigService configService;
+
+    /**
+     * 查询上岗记录
+     *
+     * @param id 上岗记录主键
+     * @return 上岗记录
+     */
+    @Override
+    public AttendancePostRecord selectAttendancePostRecordById(Long id) {
+        return attendancePostRecordMapper.selectAttendancePostRecordById(id);
+    }
+
+    /**
+     * 查询上岗记录列表
+     *
+     * @param attendancePostRecord 上岗记录
+     * @return 上岗记录
+     */
+    @Override
+    public List<AttendancePostRecord> selectAttendancePostRecordList(AttendancePostRecord attendancePostRecord) {
+        List<AttendancePostRecord> records = attendancePostRecordMapper.selectAttendancePostRecordList(attendancePostRecord);
+        if (CollectionUtil.isEmpty(records)) {
+            return new ArrayList<>();
+        }
+        records = records.stream().map(record -> {
+            //下通道时间是2001年1月1日00:00:00，所以这里要设置为null
+            if(record.getCheckOutTime() != null && record.getCheckOutTime().getTime() == 978352000000L){
+                record.setCheckOutTime(null);
+            }
+            if(record.getWorkDuration() !=null && record.getWorkDuration() < 0){
+                record.setWorkDuration(0L);
+            }
+            return record;
+        }).collect(Collectors.toList());
+        return records;
+    }
+
+    /**
+     * 新增上岗记录
+     *
+     * @param attendancePostRecord 上岗记录
+     * @return 结果
+     */
+    @Override
+    public int insertAttendancePostRecord(AttendancePostRecord attendancePostRecord) {
+        attendancePostRecord.setCreateTime(DateUtils.getNowDate());
+        return attendancePostRecordMapper.insertAttendancePostRecord(attendancePostRecord);
+    }
+
+    /**
+     * 修改上岗记录
+     *
+     * @param attendancePostRecord 上岗记录
+     * @return 结果
+     */
+    @Override
+    public int updateAttendancePostRecord(AttendancePostRecord attendancePostRecord) {
+        attendancePostRecord.setUpdateTime(DateUtils.getNowDate());
+        return attendancePostRecordMapper.updateAttendancePostRecord(attendancePostRecord);
+    }
+
+    /**
+     * 批量删除上岗记录
+     *
+     * @param ids 需要删除的上岗记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAttendancePostRecordByIds(Long[] ids) {
+        return attendancePostRecordMapper.deleteAttendancePostRecordByIds(ids);
+    }
+
+    /**
+     * 删除上岗记录信息
+     *
+     * @param id 上岗记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAttendancePostRecordById(Long id) {
+        return attendancePostRecordMapper.deleteAttendancePostRecordById(id);
+    }
+
+    /**
+     * 查询指定用户当天的上岗记录
+     *
+     * @param userId 用户ID
+     * @param today 当天日期
+     * @return 上岗记录集合
+     */
+    @Override
+    public List<AttendancePostRecord> selectTodayRecordsByUserId(Long userId, Date today) {
+        return attendancePostRecordMapper.selectTodayRecordsByUserId(userId, today);
+    }
+
+    /**
+     * 查询指定班次代码当天的上岗记录
+     *
+     * @param today 当天日期
+     * @param shiftCodes 班次代码列表
+     * @return 上岗记录集合
+     */
+    @Override
+    public List<AttendancePostRecord> selectTodayRecordsByShiftCodes(Date today, List<String> shiftCodes) {
+        return attendancePostRecordMapper.selectTodayRecordsByShiftCodes(today, shiftCodes);
+    }
+
+    /**
+     * 根据指定时间获取用户的在岗位置信息
+     *
+     * @param userId 用户ID
+     * @param queryTime 查询时间
+     * @return 上岗记录集合
+     */
+    @Override
+    public List<AttendancePostRecord> selectLocationsByTime(Long userId, Date queryTime) {
+        return attendancePostRecordMapper.selectLocationsByTime(userId, queryTime);
+    }
+
+    /**
+     * 根据指定时间获取指定通道的在岗位置信息
+     *
+     * @param channelCodeList 通道code
+     * @param nowDate 查询时间
+     * @return 上岗记录集合
+     */
+    @Override
+    public List<AttendancePostRecord> selectLocationsByTimeAndChannelName(List<String> channelCodeList, Date nowDate,Date startTime,Date endTime) {
+        return attendancePostRecordMapper.selectLocationsByTimeAndChannelName(channelCodeList, nowDate,startTime,endTime);
+    }
+
+    /**
+     *  查询指定班次代码当天的下岗时间
+     * @param today
+     * @param shiftCodes
+     * @return
+     */
+    @Override
+    public List<AttendancePostRecord> selectCheckOutTimeByShiftCodes(Date today, List<String> shiftCodes) {
+        return attendancePostRecordMapper.selectCheckOutTimeByShiftCodes(today, shiftCodes);
+    }
+
+    /**
+     * 获取当前登录时间下科长的在岗区域
+     * @return
+     */
+    @Override
+    public List<AttendancePostRecord> selectKezhangRecordCount(Long userId,Date startTime,Date endTime) {
+        return attendancePostRecordMapper.selectKezhangRecordCount(userId, startTime, endTime);
+    }
+
+    @Override
+    public List<AttendancePostRecord> queryLastTime(Long userId) {
+        List<AttendancePostRecord> attendancePostRecords = attendancePostRecordMapper.queryLastTime(userId);
+        if (attendancePostRecords.isEmpty()) {
+            return new ArrayList<>();
+        }
+        // 按上岗时间分组
+        Map<Date, List<AttendancePostRecord>> recordsByDate = new HashMap<>();
+        for (AttendancePostRecord record : attendancePostRecords) {
+            Date checkInTime = record.getCheckInTime();
+            if (checkInTime != null) {
+                recordsByDate.computeIfAbsent(checkInTime, k -> new ArrayList<>()).add(record);
+            }
+        }
+
+        // 找到最大日期
+        Date maxDate = recordsByDate.keySet().stream()
+                .max(Date::compareTo)
+                .orElse(null);
+
+        // 返回最后一天的所有记录
+        return maxDate != null ? recordsByDate.get(maxDate) : new ArrayList<>();
+    }
+
+    @Override
+    public List<Long> queryKeIds() {
+        Map<String, Date> shiftTime = getShiftTime();
+        List<Long> longs = attendancePostRecordMapper.queryKeIds(shiftTime.get("start"), shiftTime.get("end"));
+        if(CollectionUtil.isNotEmpty(longs)){
+            return longs.stream().distinct().collect(Collectors.toList());
+        }
+        return new ArrayList<>();
+    }
+
+    @Override
+    public List<AttendancePostRecord> selectTeamOnList(Date date, Long attendanceTeamId) {
+        return attendancePostRecordMapper.selectTeamOnList( date,  attendanceTeamId);
+    }
+
+    /**
+     *  获取当前班次周期的开始和结束时间
+     * @return  map  startTime:开始时间  endTime:结束时间
+     */
+    @Override
+    public Map<String, Date> getShiftTime() {
+        try {
+            Date now = DateUtils.getNowDate();
+            String todayStr = DateUtils.getDate();
+            String startTime = configService.selectConfigByKey("attendance.post.record.start.time");
+            String endTime = configService.selectConfigByKey("attendance.post.record.end.time");
+
+            // 参数校验
+            if (StringUtils.isEmpty(startTime) || StringUtils.isEmpty(endTime)) {
+                throw new RuntimeException("班次时间配置缺失");
+            }
+
+            // 构造昨天的班次开始时间
+            Date yesterday = DateUtils.addDays(now, -1);
+            String yesterdayStr = DateUtils.parseDateToStr("yyyy-MM-dd", yesterday);
+            Date shiftStartTime = DateUtils.parseDate(yesterdayStr + " " + startTime);
+
+            // 构造今天的班次结束时间
+            Date shiftEndTime = DateUtils.parseDate(todayStr + " " + endTime);
+
+            // 如果当前时间在昨天班次时间段内，则属于昨天班次
+            // 否则属于今天班次（需要重新计算今天的班次时间段）
+            if (now.compareTo(shiftStartTime) >= 0 && now.compareTo(shiftEndTime) < 0) {
+                // 属于昨天班次，直接返回已计算的时间段
+                Map<String, Date> map = new HashMap<>();
+                map.put("start", shiftStartTime);
+                map.put("end", shiftEndTime);
+                return map;
+            } else {
+                // 属于今天班次，重新计算时间段
+                Date todayShiftStart = DateUtils.parseDate(todayStr + " " + startTime);
+                Date tomorrowShiftEnd = DateUtils.addDays(todayShiftStart, 1);
+
+                Map<String, Date> map = new HashMap<>();
+                map.put("start", todayShiftStart);
+                map.put("end", tomorrowShiftEnd);
+                return map;
+            }
+        } catch (Exception e) {
+            throw new RuntimeException("班次时间计算错误: " + e.getMessage(), e);
+        }
+    }
+
+
+
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/service/impl/AttendanceRecordServiceImpl.java

@@ -0,0 +1,489 @@
+package com.sundot.airport.attendance.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.sundot.airport.attendance.domain.AttendanceCheckRecord;
+import com.sundot.airport.attendance.domain.AttendanceRecord;
+import com.sundot.airport.attendance.enums.CheckInTypeEnum;
+import com.sundot.airport.attendance.mapper.AttendanceCheckRecordMapper;
+import com.sundot.airport.attendance.mapper.AttendanceRecordMapper;
+import com.sundot.airport.attendance.service.IAttendanceRecordService;
+import com.sundot.airport.common.dto.AttendanceRecordDTO;
+import com.sundot.airport.common.dto.AttendanceRecordRep;
+import com.sundot.airport.common.dto.AttendanceRecordReq;
+import com.sundot.airport.common.dto.UserInfo;
+import com.sundot.airport.common.exception.ServiceException;
+import com.sundot.airport.common.utils.DateUtils;
+import com.sundot.airport.common.utils.SecurityUtils;
+import com.sundot.airport.exam.event.ClockInEvent;
+import com.sundot.airport.system.service.ISysConfigService;
+import org.apache.commons.compress.utils.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * 考勤记录Service业务层处理
+ *
+ * @author wangchong
+ * @date 2025-07-10
+ */
+@Service
+public class AttendanceRecordServiceImpl implements IAttendanceRecordService {
+    @Autowired
+    private AttendanceRecordMapper attendanceRecordMapper;
+
+    @Autowired
+    private AttendanceCheckRecordMapper attendanceCheckRecordMapper;
+
+    @Autowired
+    private ApplicationEventPublisher eventPublisher;
+
+    // 梭班时间窗口(2小时内)
+    private static final long SHUTTLE_TIME_WINDOW = 2 * 60 * 60 * 1000;
+
+
+    @Autowired
+    private ISysConfigService configService;
+
+    /**
+     * 查询考勤记录
+     *
+     * @param id 考勤记录主键
+     * @return 考勤记录
+     */
+    @Override
+    public AttendanceRecord selectAttendanceRecordById(Long id) {
+        return attendanceRecordMapper.selectAttendanceRecordById(id);
+    }
+
+    /**
+     * 查询考勤记录列表
+     *
+     * @param attendanceRecord 考勤记录
+     * @return 考勤记录
+     */
+    @Override
+    public List<AttendanceRecord> selectAttendanceRecordList(AttendanceRecord attendanceRecord) {
+        return attendanceRecordMapper.selectAttendanceRecordList(attendanceRecord);
+    }
+
+    /**
+     * 新增考勤记录
+     *
+     * @param attendanceRecord 考勤记录
+     * @return 结果
+     */
+    @Override
+    public int insertAttendanceRecord(AttendanceRecord attendanceRecord) {
+        attendanceRecord.setCreateTime(DateUtils.getNowDate());
+        return attendanceRecordMapper.insertAttendanceRecord(attendanceRecord);
+    }
+
+    /**
+     * 修改考勤记录
+     *
+     * @param attendanceRecord 考勤记录
+     * @return 结果
+     */
+    @Override
+    public int updateAttendanceRecord(AttendanceRecord attendanceRecord) {
+        attendanceRecord.setUpdateTime(DateUtils.getNowDate());
+        return attendanceRecordMapper.updateAttendanceRecord(attendanceRecord);
+    }
+
+    /**
+     * 批量删除考勤记录
+     *
+     * @param ids 需要删除的考勤记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAttendanceRecordByIds(Long[] ids) {
+        return attendanceRecordMapper.deleteAttendanceRecordByIds(ids);
+    }
+
+    /**
+     * 删除考勤记录信息
+     *
+     * @param id 考勤记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAttendanceRecordById(Long id) {
+        return attendanceRecordMapper.deleteAttendanceRecordById(id);
+    }
+
+    /**
+     * 打卡签到
+     *
+     * @param dto      打卡信息
+     * @param userInfo 登录用户
+     * @return 今日打卡历史
+     */
+    @Override
+    public List<AttendanceCheckRecord> record(AttendanceRecordDTO dto, UserInfo userInfo) {
+        //确定打卡时间
+        if(ObjectUtil.isNotEmpty(dto.getCheckInDate())){
+            String startTime = configService.selectConfigByKey("attendance.record.start.time");
+            String endTime = configService.selectConfigByKey("attendance.record.end.time");
+            Date checkInTime = this.calculateAttendanceDate(new Date(), startTime, endTime, dto.getCheckInType());
+            dto.setCheckInDate(checkInTime);
+        }
+        //如果下班卡，直接取最近一条上班打卡记录
+        if(StrUtil.equals("2", dto.getCheckInType())){
+            AttendanceRecordReq dtoReq=new AttendanceRecordReq();
+            dtoReq.setUserId(userInfo.getUserId());
+            dtoReq.setCheckInDate(dto.getCheckInDate());
+            List<AttendanceRecord> attendanceRecords = queryRecordList(dtoReq);
+            if(CollectionUtil.isNotEmpty(attendanceRecords)){
+                AttendanceRecord lastRecord = attendanceRecords.get(0);
+                dto.setCheckInDate(lastRecord.getAttendanceDate());
+            }
+
+        }
+        // 处理打卡记录
+        AttendanceCheckRecord checkRecord = new AttendanceCheckRecord();
+        checkRecord.setRevision(1L);
+        checkRecord.setUserId(userInfo.getUserId());
+        checkRecord.setCheckInTime(new Date());
+        checkRecord.setCheckInDate(dto.getCheckInDate());
+        checkRecord.setCheckInType(StrUtil.equals("1", dto.getCheckInType()) ? CheckInTypeEnum.CLOCK_IN.getValue() : CheckInTypeEnum.CLOCK_OUT.getValue());
+        checkRecord.setCheckInPosition(dto.getCheckInPosition());
+        checkRecord.setUserName(userInfo.getNickName());
+        checkRecord.setRemark(dto.getRemark());
+        checkRecord.setCheckInTypeDesc(StrUtil.equals("1", dto.getCheckInType()) ? CheckInTypeEnum.CLOCK_IN.getName() : CheckInTypeEnum.CLOCK_OUT.getName());
+        checkRecord.setCreateBy(userInfo.getUserId().toString());
+        checkRecord.setCreateTime(new Date());
+
+        // 处理梭班
+        processShuttleShiftLogic(checkRecord, userInfo);
+        // 保存打卡记录
+        attendanceCheckRecordMapper.insertAttendanceCheckRecord(checkRecord);
+
+        // 如果是上班打卡,发布打卡事件,触发每日答题任务生成
+        if (StrUtil.equals("1", dto.getCheckInType())) {
+            try {
+                ClockInEvent event = new ClockInEvent(
+                    this,
+                    userInfo.getUserId(),
+                    userInfo.getDepartmentId()
+                );
+                eventPublisher.publishEvent(event);
+            } catch (Exception e) {
+                // 事件发布失败不影响打卡主流程
+                // 仅记录日志
+            }
+        }
+
+        // 处理考勤记录
+        AttendanceRecord search = new AttendanceRecord();
+        search.setUserId(userInfo.getUserId());
+        search.setAttendanceDate(dto.getCheckInDate());
+        List<AttendanceRecord> attendanceCheckRecords = attendanceRecordMapper.selectAttendanceRecordList(search);
+        if (CollectionUtil.isEmpty(attendanceCheckRecords)) {
+            AttendanceRecord attendanceRecord = getAttendanceRecord(dto, userInfo);
+            attendanceRecordMapper.insertAttendanceRecord(attendanceRecord);
+        } else {
+            AttendanceRecord attendanceRecord = getAttendanceRecord(userInfo, attendanceCheckRecords);
+            attendanceRecord.setRemark(attendanceRecord.getRemark() + "\n" + dto.getRemark());
+            attendanceRecordMapper.updateAttendanceRecord(attendanceRecord);
+        }
+
+        AttendanceCheckRecord checkSearch = new AttendanceCheckRecord();
+        checkSearch.setUserId(userInfo.getUserId());
+        checkRecord.setCheckInDate(dto.getCheckInDate());
+        return attendanceCheckRecordMapper.selectAttendanceCheckRecordList(checkSearch);
+    }
+
+    private static AttendanceRecord getAttendanceRecord(AttendanceRecordDTO dto, UserInfo userInfo) {
+        AttendanceRecord attendanceRecord = new AttendanceRecord();
+        attendanceRecord.setRevision(1L);
+        attendanceRecord.setOverDuration(0L);
+        attendanceRecord.setUserId(userInfo.getUserId());
+        if (Objects.nonNull(userInfo.getTeamsId())) {
+            attendanceRecord.setTeamCode(userInfo.getTeamsId().toString());
+        }
+        attendanceRecord.setTeamName(userInfo.getTeamsName());
+        if (Objects.nonNull(userInfo.getDepartmentId())) {
+            attendanceRecord.setDepartmentCode(userInfo.getDepartmentId().toString());
+        }
+        attendanceRecord.setDepartmentName(userInfo.getDepartmentName());
+        if (Objects.nonNull(userInfo.getStationId())) {
+            attendanceRecord.setStationCode(userInfo.getStationId().toString());
+        }
+        attendanceRecord.setStationName(userInfo.getStationName());
+        attendanceRecord.setUserName(userInfo.getNickName());
+        attendanceRecord.setWorkDuration(0L);
+        attendanceRecord.setAttendanceDate(dto.getCheckInDate());
+        attendanceRecord.setCreateBy(userInfo.getUserId().toString());
+        attendanceRecord.setCreateTime(new Date());
+        attendanceRecord.setCheckInTime(new Date());
+        attendanceRecord.setRemark(dto.getRemark());
+        return attendanceRecord;
+    }
+
+    private static AttendanceRecord getAttendanceRecord(UserInfo userInfo, List<AttendanceRecord> attendanceCheckRecords) {
+        AttendanceRecord attendanceRecord = attendanceCheckRecords.get(0);
+        // 如果有记录则默认按照签退
+        attendanceRecord.setCheckOutTime(new Date());
+        attendanceRecord.setWorkDuration((attendanceRecord.getCheckOutTime().getTime() - attendanceRecord.getCheckInTime().getTime()) / 1000 / 60);
+        attendanceRecord.setUpdateBy(userInfo.getUserId().toString());
+        attendanceRecord.setUpdateTime(new Date());
+        attendanceRecord.setRevision(attendanceRecord.getRevision() + 1);
+        return attendanceRecord;
+    }
+
+    /**
+     * 获取打卡记录
+     *
+     * @param dto 打卡记录参数
+     * @return 打卡记录
+     */
+    @Override
+    public List<AttendanceRecordRep> recordList(AttendanceRecordReq dto) {
+        List<AttendanceRecordRep> result = Lists.newArrayList();
+        AttendanceRecord recordSearch = new AttendanceRecord();
+        recordSearch.setUserId(dto.getUserId());
+        if (StrUtil.equals("1", dto.getType())) {
+            // 单日查询场景
+            Date targetAttendanceDate = dto.getCheckInDate();
+            // 计算查询时间范围
+            Date yesterday = DateUtils.addDays(targetAttendanceDate, -1);
+            // 设置查询条件
+            recordSearch.setAttendanceDateStart(yesterday);
+            recordSearch.setAttendanceDateEnd(targetAttendanceDate);
+        } else {
+            recordSearch.setAttendanceDateStart(dto.getStartDate());
+            recordSearch.setAttendanceDateEnd(dto.getEndDate());
+        }
+        List<AttendanceRecord> attendanceRecords = attendanceRecordMapper.selectAttendanceRecordList(recordSearch);
+        if (CollectionUtil.isEmpty(attendanceRecords)) {
+            return result;
+        }
+        AttendanceCheckRecord checkSearch = new AttendanceCheckRecord();
+        checkSearch.setUserId(dto.getUserId());
+        if (StrUtil.equals("1", dto.getType())) {
+            checkSearch.setCheckInDate(attendanceRecords.get(0).getAttendanceDate());
+        } else {
+            checkSearch.setCheckInDateStart(dto.getStartDate());
+            checkSearch.setCheckInDateEnd(dto.getEndDate());
+        }
+        List<AttendanceCheckRecord> attendanceCheckRecords = attendanceCheckRecordMapper.selectAttendanceCheckRecordList(checkSearch);
+
+        attendanceRecords.forEach(record -> {
+            AttendanceRecordRep main = new AttendanceRecordRep();
+            BeanUtil.copyProperties(record, main);
+            List<AttendanceCheckRecord> collect = attendanceCheckRecords.stream().filter(x -> Objects.equals(x.getCheckInDate(), record.getAttendanceDate())).collect(Collectors.toList());
+            if (CollectionUtil.isNotEmpty(collect)) {
+                collect.forEach(c -> {
+                    AttendanceRecordRep.RecordItem item = new AttendanceRecordRep.RecordItem();
+                    BeanUtil.copyProperties(c, item);
+                    main.getItems().add(item);
+                });
+            }
+            result.add(main);
+        });
+        return result;
+    }
+
+
+    /**
+     * 根据实际打卡时间和班次时间计算所属考勤日期
+     *
+     * @param checkInTime 实际打卡时间，即员工实际进行打卡操作的时间点
+     * @param shiftStartTime 班次开始时间，格式为 "HH:mm"
+     * @param shiftEndTime 班次结束时间，格式为 "HH:mm"
+     * @param checkInType 打卡类型：1-上班打卡，2-下班打卡
+     * @return 计算出的考勤日期，该次打卡记录应归属的考勤周期日期
+     */
+    public Date calculateAttendanceDate(Date checkInTime, String shiftStartTime, String shiftEndTime, String checkInType) {
+        // 参数校验
+        if (checkInTime == null || shiftStartTime == null || shiftEndTime == null) {
+            throw new ServiceException("参数不能为空: checkInTime, shiftStartTime, shiftEndTime");
+        }
+
+        final String DATE_FORMAT = "yyyy-MM-dd";
+        final String TIME_FORMAT = "HH:mm";
+
+        try {
+            String checkInDateStr = DateUtils.parseDateToStr(DATE_FORMAT, checkInTime);
+            Date checkInDateTime = DateUtils.parseDate(checkInDateStr + " " + DateUtils.parseDateToStr(TIME_FORMAT, checkInTime));
+
+            // 构造昨天的班次时间段
+            Date yesterday = DateUtils.addDays(checkInTime, -1);
+            String yesterdayStr = DateUtils.parseDateToStr(DATE_FORMAT, yesterday);
+            Date yesterdayShiftStart = DateUtils.parseDate(yesterdayStr + " " + shiftStartTime);
+            Date todayShiftEnd = DateUtils.parseDate(checkInDateStr + " " + shiftEndTime);
+
+            boolean isWithinYesterdayShift = checkInDateTime.compareTo(yesterdayShiftStart) >= 0 &&
+                    checkInDateTime.compareTo(todayShiftEnd) <= 0;
+
+            if (StrUtil.isBlank(checkInType)) {
+                // 默认规则：若在昨天班次时间内，则归属昨天
+                if (isWithinYesterdayShift) {
+                    return DateUtils.parseDate(yesterdayStr);
+                }
+                return DateUtils.parseDate(checkInDateStr);
+            } else {
+                if (StrUtil.equals("1", checkInType)) {
+                    // 类型1：如果早于昨天班次开始时间，则归属昨天
+                    if (checkInDateTime.before(yesterdayShiftStart)) {
+                        return DateUtils.parseDate(yesterdayStr);
+                    }
+                    return DateUtils.parseDate(checkInDateStr);
+                } else {
+                    // 如果早于今日班次结束时间，则归属昨天
+                    if (checkInDateTime.before(todayShiftEnd)) {
+                        return DateUtils.parseDate(yesterdayStr);
+                    }
+                    return DateUtils.parseDate(checkInDateStr);
+                }
+            }
+
+        } catch (Exception e) {
+            throw new ServiceException("日期解析失败: " + e.getMessage());
+        }
+    }
+
+
+
+    /**
+     * 处理梭班
+     *
+     * @param checkRecord 打卡记录
+     * @param userInfo 用户信息
+     */
+    private void processShuttleShiftLogic(AttendanceCheckRecord checkRecord, UserInfo userInfo) {
+        // 获取用户最近一次打卡记录
+        AttendanceCheckRecord lastRecord = getLastCheckRecord(userInfo.getUserId());
+
+        // 判断是否为梭班场景（先下后上且在时间窗口内）
+        if (isShuttleShiftScenario(lastRecord, checkRecord)) {
+            // 标记为梭班打卡
+            checkRecord.setShuttleShift(true);
+            checkRecord.setShiftType("SHUTTLE");
+
+            // 如果是上班卡，归属到第二天考勤（相对于上次考勤日期）
+            if (checkRecord.getCheckInType().equals(CheckInTypeEnum.CLOCK_IN.getValue())) {
+                Date nextDayAttendanceDate = calculateNextDayAttendanceDateForShuttleShift(lastRecord);
+                checkRecord.setCheckInDate(nextDayAttendanceDate);
+            }
+        }
+
+    }
+
+
+
+    /**
+     * 判断是否为梭班场景
+     *
+     * @param lastRecord 最近打卡记录
+     * @param currentRecord 当前打卡记录
+     * @return 是否为梭班场景
+     */
+    private boolean isShuttleShiftScenario(AttendanceCheckRecord lastRecord, AttendanceCheckRecord currentRecord) {
+        // 需要满足以下条件：
+        // 1. 存在上一次打卡记录
+        // 2. 上次是下班卡，本次是上班卡
+        // 3. 两次打卡时间间隔在梭班时间窗口内（2小时内）
+        if (lastRecord == null) {
+            return false;
+        }
+
+        boolean isSequenceValid = lastRecord.getCheckInType().equals(CheckInTypeEnum.CLOCK_OUT.getValue())
+                && currentRecord.getCheckInType().equals(CheckInTypeEnum.CLOCK_IN.getValue());
+
+        long timeDiff = currentRecord.getCheckInTime().getTime() - lastRecord.getCheckInTime().getTime();
+        boolean isTimeValid = timeDiff > 0 && timeDiff <= SHUTTLE_TIME_WINDOW;
+
+        return isSequenceValid && isTimeValid;
+    }
+
+
+
+    /**
+     * 获取用户最近一次打卡记录
+     *
+     * @param userId 用户ID
+     * @return 最近打卡记录
+     */
+    private AttendanceCheckRecord getLastCheckRecord(Long userId) {
+        AttendanceCheckRecord search = new AttendanceCheckRecord();
+        search.setUserId(userId);
+        List<AttendanceCheckRecord> records = attendanceCheckRecordMapper.selectAttendanceCheckRecordList(search);
+
+        if (CollectionUtil.isNotEmpty(records)) {
+            // 返回最近的打卡记录
+            return records.stream()
+                    .sorted((r1, r2) -> r2.getCheckInTime().compareTo(r1.getCheckInTime()))
+                    .findFirst()
+                    .orElse(null);
+        }
+        return null;
+    }
+
+
+
+    /**
+     * 计算梭班场景下的次日考勤日期（基于上次考勤日期）
+     *
+     * @param lastRecord 最近一次打卡日期
+     * @return 次日考勤日期
+     */
+    private Date calculateNextDayAttendanceDateForShuttleShift(AttendanceCheckRecord lastRecord) {
+        // 查询用户最近的考勤记录
+        if (ObjectUtil.isNotEmpty(lastRecord)) {
+            LocalDateTime lastAttendanceDate = lastRecord.getCheckInDate().toInstant()
+                    .atZone(ZoneId.systemDefault())
+                    .toLocalDateTime();
+
+            // 返回上次考勤日期的次日
+            return Date.from(
+                    lastAttendanceDate.toLocalDate()
+                            .plusDays(1)
+                            .atStartOfDay(ZoneId.systemDefault())
+                            .toInstant()
+            );
+        } else {
+            // 如果没有历史记录，则使用当前日期
+            return Date.from(
+                    LocalDate.now()
+                            .atStartOfDay(ZoneId.systemDefault())
+                            .toInstant()
+            );
+        }
+    }
+
+
+    private List<AttendanceRecord> queryRecordList(AttendanceRecordReq dto) {
+        AttendanceRecord recordSearch = new AttendanceRecord();
+        recordSearch.setUserId(dto.getUserId());
+        // 单日查询场景
+        Date targetAttendanceDate = dto.getCheckInDate();
+        // 计算查询时间范围
+        Date yesterday = DateUtils.addDays(targetAttendanceDate, -1);
+        // 设置查询条件
+        recordSearch.setAttendanceDateStart(yesterday);
+        recordSearch.setAttendanceDateEnd(targetAttendanceDate);
+        return attendanceRecordMapper.selectAttendanceRecordList(recordSearch);
+    }
+
+
+
+
+
+
+
+}

airport-attendance/src/main/java/com/sundot/airport/attendance/service/impl/AttendanceTeamUserRecordServiceImpl.java

@@ -0,0 +1,273 @@
+package com.sundot.airport.attendance.service.impl;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.sundot.airport.common.core.domain.entity.SysUser;
+import com.sundot.airport.common.exception.ServiceException;
+import com.sundot.airport.common.utils.DateUtils;
+import com.sundot.airport.system.mapper.SysUserMapper;
+import com.sundot.airport.system.service.ISysConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.sundot.airport.attendance.mapper.AttendanceTeamUserRecordMapper;
+import com.sundot.airport.attendance.domain.AttendanceTeamUserRecord;
+import com.sundot.airport.attendance.service.IAttendanceTeamUserRecordService;
+
+import static com.sundot.airport.common.utils.SecurityUtils.getUsername;
+
+/**
+ * 考勤班组成员Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2025-09-06
+ */
+@Service
+public class AttendanceTeamUserRecordServiceImpl implements IAttendanceTeamUserRecordService 
+{
+    @Autowired
+    private AttendanceTeamUserRecordMapper attendanceTeamUserRecordMapper;
+
+    @Autowired
+    private ISysConfigService configService;
+
+    @Autowired
+    private SysUserMapper userMapper;
+
+    /**
+     * 查询考勤班组成员
+     * 
+     * @param userId 考勤班组成员主键
+     * @return 考勤班组成员
+     */
+    @Override
+    public AttendanceTeamUserRecord selectAttendanceTeamUserRecordByUserId(Long userId, Date attendanceDate)
+    {
+        return attendanceTeamUserRecordMapper.selectAttendanceTeamUserRecordByUserId(userId, attendanceDate);
+    }
+
+    @Override
+    public List<AttendanceTeamUserRecord> selectAttendanceTeamUserRecordPageList(AttendanceTeamUserRecord attendanceTeamUserRecord) {
+        return attendanceTeamUserRecordMapper.selectAttendanceTeamUserRecordList(attendanceTeamUserRecord);
+    }
+
+    /**
+     * 上岗记录中查询考勤班组成员列表
+     * 
+     * @param attendanceTeamUserRecord 考勤班组成员
+     * @return 考勤班组成员
+     */
+    @Override
+    public List<AttendanceTeamUserRecord> selectAttendanceTeamUserRecordList(AttendanceTeamUserRecord attendanceTeamUserRecord)
+    {
+        // 如果指定了考勤日期，则调整查询时间范围
+        if (attendanceTeamUserRecord.getAttendanceDate() != null) {
+            try {
+                String display = configService.selectConfigByKey("attendance.team.user.record.display.end.time");
+                Date date = getDate(new Date(), display);
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                String baseDateStr = sdf.format(date);
+                String nextDateStr = sdf.format(DateUtils.addDays(date, 1));
+
+                // 显示时间范围：当日7:00到次日9:00
+                Date displayStartDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(baseDateStr + " " + configService.selectConfigByKey("attendance.team.user.record.start.time"));
+                Date displayEndDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(nextDateStr + " " + display);
+
+                // 设置查询时间范围
+                attendanceTeamUserRecord.setAttendanceDateStart(displayStartDate);
+                attendanceTeamUserRecord.setAttendanceDateEnd(displayEndDate);
+                // 清除原始的attendanceDate，避免冲突
+                attendanceTeamUserRecord.setAttendanceDate(null);
+            } catch (Exception e) {
+                throw new ServiceException("日期格式化错误");
+            }
+        }
+        return attendanceTeamUserRecordMapper.selectAttendanceTeamUserRecordList(attendanceTeamUserRecord);
+    }
+
+
+    /**
+     * 新增考勤班组成员
+     * 
+     * @param attendanceTeamUserRecord 考勤班组成员
+     * @return 结果
+     */
+    @Override
+    public int insertAttendanceTeamUserRecord(AttendanceTeamUserRecord attendanceTeamUserRecord)
+    {
+        attendanceTeamUserRecord.setCreateTime(DateUtils.getNowDate());
+        return attendanceTeamUserRecordMapper.insertAttendanceTeamUserRecord(attendanceTeamUserRecord);
+    }
+
+    /**
+     * 修改考勤班组成员
+     * 
+     * @param attendanceTeamUserRecord 考勤班组成员
+     * @return 结果
+     */
+    @Override
+    public int updateAttendanceTeamUserRecord(AttendanceTeamUserRecord attendanceTeamUserRecord)
+    {
+        attendanceTeamUserRecord.setUpdateTime(DateUtils.getNowDate());
+        return attendanceTeamUserRecordMapper.updateAttendanceTeamUserRecord(attendanceTeamUserRecord);
+    }
+
+    /**
+     * 批量删除考勤班组成员
+     * 
+     * @param userIds 需要删除的考勤班组成员主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAttendanceTeamUserRecordByUserIds(Long[] userIds)
+    {
+        return attendanceTeamUserRecordMapper.deleteAttendanceTeamUserRecordByUserIds(userIds);
+    }
+
+    /**
+     * 删除考勤班组成员信息
+     * 
+     * @param userId 考勤班组成员主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAttendanceTeamUserRecordByUserId(Long userId)
+    {
+        return attendanceTeamUserRecordMapper.deleteAttendanceTeamUserRecordByUserId(userId);
+    }
+
+    /**
+     *  批量插入考勤班组成员
+     * @param attendanceTeamUserRecord
+     * @return
+     */
+    @Override
+    public int insertAttendanceTeamUserRecordList(List<AttendanceTeamUserRecord> attendanceTeamUserRecord) {
+        List<String> userName = new ArrayList<>();
+        attendanceTeamUserRecord.forEach(record -> {
+            record.setCreateTime(DateUtils.getNowDate());
+            record.setCreateBy(getUsername());
+            if(Objects.isNull(record.getAttendanceDate())){
+                record.setAttendanceDate(DateUtils.getNowDate());
+            }
+            if(Objects.isNull(record.getUserId())){
+                throw new ServiceException("用户id不能为空");
+            }
+
+            // 计算班次周期范围：前一天到后一天
+            Date startDate = DateUtils.addDays(record.getAttendanceDate(), -1);
+            Date endDate = DateUtils.addDays(record.getAttendanceDate(), 1);
+
+            // 构建查询条件
+            AttendanceTeamUserRecord searchRecord = new AttendanceTeamUserRecord();
+            searchRecord.setUserId(record.getUserId());
+            searchRecord.setAttendanceDateStart(startDate);
+            searchRecord.setAttendanceDateEnd(endDate);
+
+            // 查询时间范围内的记录
+            List<AttendanceTeamUserRecord> existingRecords = attendanceTeamUserRecordMapper
+                    .selectAttendanceTeamUserRecordList(searchRecord);
+
+            // 检查是否存在班次周期内的重复记录（当日7:00 - 次日7:00）
+            if (hasRecordInShiftPeriod(existingRecords, record.getAttendanceDate())) {
+                // 获取第一个重复记录的用户名
+                AttendanceTeamUserRecord firstDuplicate = existingRecords.stream()
+                        .filter(r -> isWithinShiftPeriod(r.getCreateTime(), new Date()))
+                        .findFirst()
+                        .orElse(null);
+                if (firstDuplicate != null) {
+                    userName.add(firstDuplicate.getUserName());
+                }
+            }
+        });
+        if(userName.size()>0){
+            throw new ServiceException(StrUtil.format("用户{}在当前班次周期内已维护", JSONArray.toJSONString(userName)));
+        }
+        return attendanceTeamUserRecordMapper.insertAttendanceTeamUserRecordList(attendanceTeamUserRecord);
+    }
+
+    @Override
+    public List<Long> selectAttendanceTeamLeaderId() {
+        AttendanceTeamUserRecord attendanceTeamUserRecord = new AttendanceTeamUserRecord();
+        attendanceTeamUserRecord.setAttendanceDate(DateUtils.getNowDate());
+        List<AttendanceTeamUserRecord> attendanceTeamUserRecords = selectAttendanceTeamUserRecordList(attendanceTeamUserRecord);
+        List<Long> collect = attendanceTeamUserRecords.stream().map(AttendanceTeamUserRecord::getAttendanceTeamId).collect(Collectors.toList());
+        if(CollectionUtil.isEmpty( collect)){
+            return new ArrayList<>() ;
+        }
+        List<Long> longs = userMapper.selectAttendanceTeamLeaderId(collect);
+        if(CollectionUtil.isEmpty(longs)){
+            return new ArrayList<>();
+        }
+        return longs.stream().distinct().collect(Collectors.toList());
+    }
+
+
+
+    /**
+     * 判断是否存在班次周期内的记录
+     * @param records 查询到的记录列表
+     * @param targetDate 目标日期
+     * @return 是否存在班次周期内的记录
+     */
+    private boolean hasRecordInShiftPeriod(List<AttendanceTeamUserRecord> records, Date targetDate) {
+        return records.stream().anyMatch(record -> isWithinShiftPeriod(record.getCreateTime(), targetDate));
+    }
+
+    /**
+     * 判断指定日期是否在目标日期的班次周期内（当日7:00 - 次日7:00）
+     * @param recordDate 记录日期
+     * @param targetDate 目标日期
+     * @return 是否在班次周期内
+     */
+    private boolean isWithinShiftPeriod(Date recordDate, Date targetDate) {
+        if (recordDate == null || targetDate == null) {
+            return false;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        try {
+            String end = configService.selectConfigByKey("attendance.team.user.record.end.time");
+            targetDate = getDate(targetDate, end);
+            String targetDateStr = sdf.format(targetDate);
+            String nextDateStr = sdf.format(DateUtils.addDays(targetDate, 1));
+            String recordDateStr = sdf.format(recordDate);
+
+            // 班次的开始时间（targetDate 07:00:00）
+            Date shiftStartTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(targetDateStr + " " + configService.selectConfigByKey("attendance.team.user.record.start.time"));
+
+            // 班次的结束时间（targetDate+1天 07:00:00）
+            Date shiftEndTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(nextDateStr + " " + end);
+
+            // 构造记录日期的代表时间（recordDate 00:00:00）
+            Date recordDateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(recordDateStr + " 00:00:00");
+
+            // 判断记录日期是否在班次周期内
+            return !(recordDateTime.before(shiftStartTime) || recordDateTime.after(shiftEndTime));
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    private Date getDate(Date targetDate, String time) {
+        if (targetDate == null) {
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        try {
+            //判断targetDate是否在7点之前
+            if (targetDate.before(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(sdf.format(targetDate) +" "+ time))) {
+                targetDate=DateUtils.addDays(targetDate, -1);
+            }
+            return targetDate;
+        } catch (ParseException e) {
+            throw new ServiceException("日期解析失败");
+        }
+    }
+
+}

airport-attendance/src/main/resources/mapper/attendance/AttendanceAreaMapper.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sundot.airport.attendance.mapper.AttendanceAreaMapper">
+
+    <!-- 通用结果映射 -->
+    <resultMap id="AttendanceAreaResult" type="AttendanceArea">
+        <id column="id" property="id" jdbcType="INTEGER"/>
+        <result column="area_name" property="areaName" jdbcType="VARCHAR"/>
+        <result column="address" property="address" jdbcType="VARCHAR"/>
+        <result column="longitude" property="longitude" jdbcType="DECIMAL"/>
+        <result column="latitude" property="latitude" jdbcType="DECIMAL"/>
+        <result column="radius" property="radius" jdbcType="INTEGER"/>
+        <result column="status" property="status" jdbcType="TINYINT"/>
+        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
+        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <!-- 带距离计算的结果映射 -->
+    <resultMap id="DistanceResultMap" type="AttendanceArea"
+               extends="AttendanceAreaResult">
+        <result column="distance" property="distance" jdbcType="DECIMAL"/>
+    </resultMap>
+
+    <sql id="selectAttendanceCheckRecordVo">
+        select id, area_name, address, longitude, latitude, radius, status, create_time, update_time from attendance_area
+    </sql>
+
+    <select id="findValidAreasEfficiently" resultMap="DistanceResultMap">
+        SELECT
+            id, area_name, address,
+            longitude, latitude, radius, status,
+            create_time, update_time,
+            ST_Distance_Sphere(
+                    POINT(longitude, latitude),
+                    POINT(#{lng}, #{lat})
+            ) AS distance
+        FROM attendance_area
+        WHERE
+            status = 1
+          AND longitude IS NOT NULL
+          AND latitude IS NOT NULL
+          AND longitude BETWEEN -180 AND 180
+          AND latitude BETWEEN -90 AND 90
+          AND ST_Distance_Sphere(
+                POINT(longitude, latitude),
+                POINT(#{lng}, #{lat})
+              ) BETWEEN 0 AND radius
+    </select>
+
+    <select id="areaList"  resultMap="DistanceResultMap">
+        <include refid="selectAttendanceCheckRecordVo"/>
+        WHERE
+        status = 1
+    </select>
+
+</mapper>

airport-attendance/src/main/resources/mapper/attendance/AttendanceCheckRecordMapper.xml

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sundot.airport.attendance.mapper.AttendanceCheckRecordMapper">
+
+    <resultMap type="AttendanceCheckRecord" id="AttendanceCheckRecordResult">
+        <result property="tenantId"    column="tenant_id"    />
+        <result property="revision"    column="revision"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="id"    column="id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="checkInType"    column="check_in_type"    />
+        <result property="checkInTime"    column="check_in_time"    />
+        <result property="userName"    column="user_name"    />
+        <result property="remark"    column="remark"    />
+        <result property="checkInTypeDesc"    column="check_in_type_desc"    />
+        <result property="checkInPosition"    column="check_in_position"    />
+        <result property="checkInDate"    column="check_in_date"    />
+    </resultMap>
+
+    <sql id="selectAttendanceCheckRecordVo">
+        select tenant_id, revision, create_by, create_time, update_by, update_time, id, user_id, check_in_type, check_in_time, user_name, remark, check_in_type_desc, check_in_position, check_in_date from attendance_check_record
+    </sql>
+
+    <select id="selectAttendanceCheckRecordList" parameterType="AttendanceCheckRecord" resultMap="AttendanceCheckRecordResult">
+        <include refid="selectAttendanceCheckRecordVo"/>
+        <where>
+            <if test="tenantId != null  and tenantId != ''"> and tenant_id = #{tenantId}</if>
+            <if test="revision != null "> and revision = #{revision}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="checkInType != null  and checkInType != ''"> and check_in_type = #{checkInType}</if>
+            <if test="checkInTime != null "> and check_in_time = #{checkInTime}</if>
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+            <if test="remark != null  and remark != ''"> and remark = #{remark}</if>
+            <if test="checkInTypeDesc != null  and checkInTypeDesc != ''"> and check_in_type_desc = #{checkInTypeDesc}</if>
+            <if test="checkInPosition != null  and checkInPosition != ''"> and check_in_position = #{checkInPosition}</if>
+            <if test="checkInDate != null "> and check_in_date = #{checkInDate}</if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(check_in_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(check_in_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
+            </if>
+            <if test="checkInDateStart != null "> and check_in_date &gt;= concat(#{checkInDateStart}, ' 00:00:00')</if>
+            <if test="checkInDateEnd != null "> and check_in_date &lt;= concat(#{checkInDateEnd}, ' 23:59:59')</if>
+        </where>
+        order by create_time desc
+    </select>
+
+    <select id="selectAttendanceCheckRecordById" parameterType="Long" resultMap="AttendanceCheckRecordResult">
+        <include refid="selectAttendanceCheckRecordVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertAttendanceCheckRecord" parameterType="AttendanceCheckRecord" useGeneratedKeys="true" keyProperty="id">
+        insert into attendance_check_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="tenantId != null">tenant_id,</if>
+            <if test="revision != null">revision,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="checkInType != null and checkInType != ''">check_in_type,</if>
+            <if test="checkInTime != null">check_in_time,</if>
+            <if test="userName != null and userName != ''">user_name,</if>
+            <if test="remark != null">remark,</if>
+            <if test="checkInTypeDesc != null and checkInTypeDesc != ''">check_in_type_desc,</if>
+            <if test="checkInPosition != null">check_in_position,</if>
+            <if test="checkInDate != null">check_in_date,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="tenantId != null">#{tenantId},</if>
+            <if test="revision != null">#{revision},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="checkInType != null and checkInType != ''">#{checkInType},</if>
+            <if test="checkInTime != null">#{checkInTime},</if>
+            <if test="userName != null and userName != ''">#{userName},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="checkInTypeDesc != null and checkInTypeDesc != ''">#{checkInTypeDesc},</if>
+            <if test="checkInPosition != null">#{checkInPosition},</if>
+            <if test="checkInDate != null">#{checkInDate},</if>
+        </trim>
+    </insert>
+
+    <update id="updateAttendanceCheckRecord" parameterType="AttendanceCheckRecord">
+        update attendance_check_record
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="tenantId != null">tenant_id = #{tenantId},</if>
+            <if test="revision != null">revision = #{revision},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="checkInType != null and checkInType != ''">check_in_type = #{checkInType},</if>
+            <if test="checkInTime != null">check_in_time = #{checkInTime},</if>
+            <if test="userName != null and userName != ''">user_name = #{userName},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="checkInTypeDesc != null and checkInTypeDesc != ''">check_in_type_desc = #{checkInTypeDesc},</if>
+            <if test="checkInPosition != null">check_in_position = #{checkInPosition},</if>
+            <if test="checkInDate != null">check_in_date = #{checkInDate},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteAttendanceCheckRecordById" parameterType="Long">
+        delete from attendance_check_record where id = #{id}
+    </delete>
+
+    <delete id="deleteAttendanceCheckRecordByIds" parameterType="String">
+        delete from attendance_check_record where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

airport-attendance/src/main/resources/mapper/attendance/AttendanceRecordMapper.xml

@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sundot.airport.attendance.mapper.AttendanceRecordMapper">
+    
+    <resultMap type="AttendanceRecord" id="AttendanceRecordResult">
+        <result property="tenantId"    column="tenant_id"    />
+        <result property="revision"    column="revision"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="id"    column="id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="checkInTime"    column="check_in_time"    />
+        <result property="checkOutTime"    column="check_out_time"    />
+        <result property="workDuration"    column="work_duration"    />
+        <result property="status"    column="status"    />
+        <result property="teamCode"    column="team_code"    />
+        <result property="teamName"    column="team_name"    />
+        <result property="departmentCode"    column="department_code"    />
+        <result property="departmentName"    column="department_name"    />
+        <result property="stationCode"    column="station_code"    />
+        <result property="stationName"    column="station_name"    />
+        <result property="userName"    column="user_name"    />
+        <result property="remark"    column="remark"    />
+        <result property="attendanceDate"    column="attendance_date"    />
+        <result property="overDuration"    column="over_duration"    />
+        <result property="statusDesc"    column="status_desc"    />
+    </resultMap>
+
+    <sql id="selectAttendanceRecordVo">
+        select tenant_id, revision, create_by, create_time, update_by, update_time, id, user_id, check_in_time, check_out_time, work_duration, status, team_code, team_name, department_code, department_name, station_code, station_name, user_name, remark, attendance_date, over_duration, status_desc from attendance_record
+    </sql>
+
+    <select id="selectAttendanceRecordList" parameterType="AttendanceRecord" resultMap="AttendanceRecordResult">
+        <include refid="selectAttendanceRecordVo"/>
+        <where>  
+            <if test="tenantId != null  and tenantId != ''"> and tenant_id = #{tenantId}</if>
+            <if test="revision != null "> and revision = #{revision}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="checkInTime != null "> and check_in_time = #{checkInTime}</if>
+            <if test="checkOutTime != null "> and check_out_time = #{checkOutTime}</if>
+            <if test="workDuration != null "> and work_duration = #{workDuration}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="teamCode != null  and teamCode != ''"> and team_code = #{teamCode}</if>
+            <if test="teamName != null  and teamName != ''"> and team_name like concat('%', #{teamName}, '%')</if>
+            <if test="departmentCode != null  and departmentCode != ''"> and department_code = #{departmentCode}</if>
+            <if test="departmentName != null  and departmentName != ''"> and department_name like concat('%', #{departmentName}, '%')</if>
+            <if test="stationCode != null  and stationCode != ''"> and station_code = #{stationCode}</if>
+            <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+            <if test="remark != null  and remark != ''"> and remark = #{remark}</if>
+            <if test="attendanceDate != null "> and attendance_date = #{attendanceDate}</if>
+            <if test="overDuration != null "> and over_duration = #{overDuration}</if>
+            <if test="statusDesc != null  and statusDesc != ''"> and status_desc = #{statusDesc}</if>
+
+            <if test="attendanceDateStart != null "> and attendance_date &gt;= concat(#{attendanceDateStart}, ' 00:00:00')</if>
+            <if test="attendanceDateEnd != null "> and attendance_date &lt;= concat(#{attendanceDateEnd}, ' 23:59:59')</if>
+        </where>
+        order by create_time desc
+    </select>
+    
+    <select id="selectAttendanceRecordById" parameterType="Long" resultMap="AttendanceRecordResult">
+        <include refid="selectAttendanceRecordVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertAttendanceRecord" parameterType="AttendanceRecord" useGeneratedKeys="true" keyProperty="id">
+        insert into attendance_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="tenantId != null">tenant_id,</if>
+            <if test="revision != null">revision,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="checkInTime != null">check_in_time,</if>
+            <if test="checkOutTime != null">check_out_time,</if>
+            <if test="workDuration != null">work_duration,</if>
+            <if test="status != null and status != ''">status,</if>
+            <if test="teamCode != null and teamCode != ''">team_code,</if>
+            <if test="teamName != null and teamName != ''">team_name,</if>
+            <if test="departmentCode != null and departmentCode != ''">department_code,</if>
+            <if test="departmentName != null and departmentName != ''">department_name,</if>
+            <if test="stationCode != null and stationCode != ''">station_code,</if>
+            <if test="stationName != null and stationName != ''">station_name,</if>
+            <if test="userName != null and userName != ''">user_name,</if>
+            <if test="remark != null">remark,</if>
+            <if test="attendanceDate != null">attendance_date,</if>
+            <if test="overDuration != null">over_duration,</if>
+            <if test="statusDesc != null and statusDesc != ''">status_desc,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="tenantId != null">#{tenantId},</if>
+            <if test="revision != null">#{revision},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="checkInTime != null">#{checkInTime},</if>
+            <if test="checkOutTime != null">#{checkOutTime},</if>
+            <if test="workDuration != null">#{workDuration},</if>
+            <if test="status != null and status != ''">#{status},</if>
+            <if test="teamCode != null and teamCode != ''">#{teamCode},</if>
+            <if test="teamName != null and teamName != ''">#{teamName},</if>
+            <if test="departmentCode != null and departmentCode != ''">#{departmentCode},</if>
+            <if test="departmentName != null and departmentName != ''">#{departmentName},</if>
+            <if test="stationCode != null and stationCode != ''">#{stationCode},</if>
+            <if test="stationName != null and stationName != ''">#{stationName},</if>
+            <if test="userName != null and userName != ''">#{userName},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="attendanceDate != null">#{attendanceDate},</if>
+            <if test="overDuration != null">#{overDuration},</if>
+            <if test="statusDesc != null and statusDesc != ''">#{statusDesc},</if>
+         </trim>
+    </insert>
+
+    <update id="updateAttendanceRecord" parameterType="AttendanceRecord">
+        update attendance_record
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="tenantId != null">tenant_id = #{tenantId},</if>
+            <if test="revision != null">revision = #{revision},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="checkInTime != null">check_in_time = #{checkInTime},</if>
+            <if test="checkOutTime != null">check_out_time = #{checkOutTime},</if>
+            <if test="workDuration != null">work_duration = #{workDuration},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="teamCode != null and teamCode != ''">team_code = #{teamCode},</if>
+            <if test="teamName != null and teamName != ''">team_name = #{teamName},</if>
+            <if test="departmentCode != null and departmentCode != ''">department_code = #{departmentCode},</if>
+            <if test="departmentName != null and departmentName != ''">department_name = #{departmentName},</if>
+            <if test="stationCode != null and stationCode != ''">station_code = #{stationCode},</if>
+            <if test="stationName != null and stationName != ''">station_name = #{stationName},</if>
+            <if test="userName != null and userName != ''">user_name = #{userName},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="attendanceDate != null">attendance_date = #{attendanceDate},</if>
+            <if test="overDuration != null">over_duration = #{overDuration},</if>
+            <if test="statusDesc != null and statusDesc != ''">status_desc = #{statusDesc},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteAttendanceRecordById" parameterType="Long">
+        delete from attendance_record where id = #{id}
+    </delete>
+
+    <delete id="deleteAttendanceRecordByIds" parameterType="String">
+        delete from attendance_record where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

airport-attendance/src/main/resources/mapper/attendance/AttendanceTeamUserRecordMapper.xml

@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sundot.airport.attendance.mapper.AttendanceTeamUserRecordMapper">
+    
+    <resultMap type="AttendanceTeamUserRecord" id="AttendanceTeamUserRecordResult">
+        <result property="userId"    column="user_id"    />
+        <result property="userCode"    column="user_code"    />
+        <result property="userName"    column="user_name"    />
+        <result property="terminlCode"    column="terminl_code"    />
+        <result property="terminlName"    column="terminl_name"    />
+        <result property="attendanceDate"    column="attendance_date"    />
+        <result property="attendanceTeamId"    column="attendance_team_id"    />
+        <result property="attendanceTeamName"    column="attendance_team_name"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectAttendanceTeamUserRecordVo">
+        select user_id, user_code, user_name, terminl_code, terminl_name, attendance_date, attendance_team_id, attendance_team_name, create_by, create_time, update_by, update_time, remark from attendance_team_user_record
+    </sql>
+
+    <select id="selectAttendanceTeamUserRecordList" parameterType="AttendanceTeamUserRecord" resultMap="AttendanceTeamUserRecordResult">
+        <include refid="selectAttendanceTeamUserRecordVo"/>
+        <where>  
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="userCode != null  and userCode != ''"> and user_code = #{userCode}</if>
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+            <if test="terminlCode != null  and terminlCode != ''"> and terminl_code = #{terminlCode}</if>
+            <if test="terminlName != null  and terminlName != ''"> and terminl_name like concat('%', #{terminlName}, '%')</if>
+            <if test="attendanceDate != null "> and attendance_date = #{attendanceDate}</if>
+            <!-- 添加时间范围查询支持 -->
+            <if test="attendanceDateStart != null "> and create_time >= #{attendanceDateStart}</if>
+            <if test="attendanceDateEnd != null "> and create_time &lt;= #{attendanceDateEnd}</if>
+            <if test="attendanceTeamId != null "> and attendance_team_id = #{attendanceTeamId}</if>
+            <if test="attendanceTeamName != null  and attendanceTeamName != ''"> and attendance_team_name like concat('%', #{attendanceTeamName}, '%')</if>
+        </where>
+        order by create_time desc
+    </select>
+    
+    <select id="selectAttendanceTeamUserRecordByUserId"  resultMap="AttendanceTeamUserRecordResult">
+        <include refid="selectAttendanceTeamUserRecordVo"/>
+        where user_id = #{userId}
+         and DATE(attendance_date) = DATE(#{attendanceDate})
+    </select>
+
+    <insert id="insertAttendanceTeamUserRecord" parameterType="AttendanceTeamUserRecord">
+        insert into attendance_team_user_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userId != null">user_id,</if>
+            <if test="userCode != null and userCode != ''">user_code,</if>
+            <if test="userName != null and userName != ''">user_name,</if>
+            <if test="terminlCode != null">terminl_code,</if>
+            <if test="terminlName != null">terminl_name,</if>
+            <if test="attendanceDate != null">attendance_date,</if>
+            <if test="attendanceTeamId != null">attendance_team_id,</if>
+            <if test="attendanceTeamName != null">attendance_team_name,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userId != null">#{userId},</if>
+            <if test="userCode != null and userCode != ''">#{userCode},</if>
+            <if test="userName != null and userName != ''">#{userName},</if>
+            <if test="terminlCode != null">#{terminlCode},</if>
+            <if test="terminlName != null">#{terminlName},</if>
+            <if test="attendanceDate != null">#{attendanceDate},</if>
+            <if test="attendanceTeamId != null">#{attendanceTeamId},</if>
+            <if test="attendanceTeamName != null">#{attendanceTeamName},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateAttendanceTeamUserRecord" parameterType="AttendanceTeamUserRecord">
+        update attendance_team_user_record
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="userCode != null and userCode != ''">user_code = #{userCode},</if>
+            <if test="userName != null and userName != ''">user_name = #{userName},</if>
+            <if test="terminlCode != null">terminl_code = #{terminlCode},</if>
+            <if test="terminlName != null">terminl_name = #{terminlName},</if>
+            <if test="attendanceDate != null">attendance_date = #{attendanceDate},</if>
+            <if test="attendanceTeamId != null">attendance_team_id = #{attendanceTeamId},</if>
+            <if test="attendanceTeamName != null">attendance_team_name = #{attendanceTeamName},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where user_id = #{userId}
+    </update>
+
+    <delete id="deleteAttendanceTeamUserRecordByUserId" parameterType="Long">
+        delete from attendance_team_user_record where user_id = #{userId}
+    </delete>
+
+    <delete id="deleteAttendanceTeamUserRecordByUserIds" parameterType="String">
+        delete from attendance_team_user_record where user_id in 
+        <foreach item="userId" collection="array" open="(" separator="," close=")">
+            #{userId}
+        </foreach>
+    </delete>
+
+    <insert id="insertAttendanceTeamUserRecordList">
+        insert into attendance_team_user_record
+        (user_id, user_code, user_name, terminl_code, terminl_name, attendance_date,
+        attendance_team_id, attendance_team_name, create_by, create_time)
+        values
+        <foreach collection="list" item="item" separator=",">
+            (#{item.userId}, #{item.userCode}, #{item.userName}, #{item.terminlCode},
+            #{item.terminlName}, #{item.attendanceDate}, #{item.attendanceTeamId},
+            #{item.attendanceTeamName}, #{item.createBy}, #{item.createTime})
+        </foreach>
+    </insert>
+
+    <select id="selectAttendanceTeamUserRecordByUserIdAndDateRange" resultMap="AttendanceTeamUserRecordResult">
+        SELECT
+        tenant_id, revision, create_by, create_time, update_by, update_time,
+        user_id, user_name, user_code, terminl_code, terminl_name,
+        attendance_date, attendance_team_id, attendance_team_name, remark
+        FROM attendance_team_user_record
+        WHERE user_id = #{userId}
+        AND attendance_date >= #{startDate}
+        AND attendance_date &lt;= #{endDate}
+    </select>
+
+
+</mapper>