勤务模块

airport-admin/src/main/java/com/sundot/airport/web/controller/attendance/AttendancePostRecordController.java

@@ -124,8 +124,11 @@ public class AttendancePostRecordController extends BaseController {
     public AjaxResult listGroupByTimeAndUserId() {
         Long currentUserId = SecurityUtils.getUserId();
         // 计算当前时间对应的班次日期
-        Date queryDate = determineShiftDate();
-
+//        Date queryDate = determineShiftDate();
+        Date queryDate = attendancePostRecordService.selectMaxDateByUserId(currentUserId);
+        if (queryDate == null) {
+            queryDate = DateUtils.getNowDate();
+        }
         // 先获取当前用户今天的记录，取出班次信息
         List<AttendancePostRecord> userRecords = attendancePostRecordService.selectTodayRecordsByUserId(currentUserId, queryDate);
 
@@ -365,7 +368,8 @@ public class AttendancePostRecordController extends BaseController {
             record.setRevision(1L);
             record.setWorkDuration((record.getCheckOutTime().getTime() - record.getCheckInTime().getTime()) / 1000 / 60);
             // 使用班次日期逻辑设置考勤日期
-            Date shiftDate = determineShiftDate();
+//            Date shiftDate = determineShiftDate();
+            Date shiftDate = DateUtils.getNowDate();
             record.setAttendanceDate(shiftDate);
             record.setOverDuration(0L);
             record.setCreateBy(getUserId().toString());
@@ -395,8 +399,8 @@ public class AttendancePostRecordController extends BaseController {
             postRecord.setRevision(postRecord.getRevision() + 1);
             postRecord.setWorkDuration((postRecord.getCheckOutTime().getTime() - postRecord.getCheckInTime().getTime()) / 1000 / 60);
             // 使用班次日期逻辑设置考勤日期
-            Date shiftDate = determineShiftDate();
-            postRecord.setAttendanceDate(shiftDate);
+//            Date shiftDate = determineShiftDate();
+//            postRecord.setAttendanceDate(shiftDate);
             extracted(postRecord);
             // 判断是否已签退
             LocalDateTime baseDateTime = LocalDateTime.of(2000, 1, 1, 0, 0, 0);
@@ -404,6 +408,18 @@ public class AttendancePostRecordController extends BaseController {
                 postRecord.setLocked(false);
             }
             count += attendancePostRecordService.updateAttendancePostRecord(postRecord);
+
+            // 处理考勤班组成员表
+            AttendanceTeamUserRecord queryAttendanceTeamUserRecord = new AttendanceTeamUserRecord();
+            queryAttendanceTeamUserRecord.setCreateBy(SecurityUtils.getUsername());
+            queryAttendanceTeamUserRecord.setUserId(postRecord.getUserId());
+            queryAttendanceTeamUserRecord.setCheckInType("1");
+            List<AttendanceTeamUserRecord> attendanceTeamUserRecordList = attendanceTeamUserRecordService.selectAttendanceTeamUserRecordList(queryAttendanceTeamUserRecord);
+            attendanceTeamUserRecordList.forEach(attendanceTeamUserRecord -> {
+                attendanceTeamUserRecord.setUpdateBy(SecurityUtils.getUsername());
+                attendanceTeamUserRecord.setCheckInType("2");
+                attendanceTeamUserRecordService.updateAttendanceTeamUserRecord(attendanceTeamUserRecord);
+            });
         }
 
 
@@ -1078,13 +1094,19 @@ public class AttendancePostRecordController extends BaseController {
     private boolean isUserRecordLocked(Long userId) {
         try {
             // 获取当前班次日期
-            Date shiftDate = determineShiftDate();
+//            Date shiftDate = determineShiftDate();
+            Date shiftDate = attendancePostRecordService.selectMaxDateByUserId(userId);
+            if (shiftDate == null) {
+                shiftDate = DateUtils.getNowDate();
+            }
             List<AttendancePostRecord> userRecords = attendancePostRecordService.selectTodayRecordsByUserId(userId, shiftDate);
 
             // 检查是否有已锁定且在当前班次周期内的记录
+//            return userRecords.stream()
+//                    .anyMatch(record -> record.getLocked() != null && record.getLocked()
+//                            && isWithinCurrentShiftPeriod(record.getLockTime()));
             return userRecords.stream()
-                    .anyMatch(record -> record.getLocked() != null && record.getLocked()
-                            && isWithinCurrentShiftPeriod(record.getLockTime()));
+                    .anyMatch(record -> record.getLocked() != null && record.getLocked());
         } catch (Exception e) {
             return false;
         }

airport-admin/src/main/java/com/sundot/airport/web/controller/attendance/AttendanceTeamUserRecordController.java

@@ -55,7 +55,6 @@ public class AttendanceTeamUserRecordController extends BaseController {
     @PreAuthorize("@ss.hasPermi('attendance:record:list')")
     @GetMapping("/list")
     public TableDataInfo list(AttendanceTeamUserRecord attendanceTeamUserRecord) {
-        startPage();
         List<AttendanceTeamUserRecord> list = attendanceTeamUserRecordService.selectAttendanceTeamUserRecordList(attendanceTeamUserRecord);
         return getDataTable(list);
     }
@@ -132,4 +131,13 @@ public class AttendanceTeamUserRecordController extends BaseController {
         return success(attendanceTeamUserRecordService.selectAttendanceTeamLeaderId());
     }
 
+    /**
+     * 根据主键删除考勤班组成员
+     */
+    @PreAuthorize("@ss.hasPermi('attendance:record:remove')")
+    @Log(title = "考勤班组成员", businessType = BusinessType.DELETE)
+    @DeleteMapping("/removeBy/{ids}")
+    public AjaxResult removeBy(@PathVariable Long[] ids) {
+        return toAjax(attendanceTeamUserRecordService.deleteAttendanceTeamUserRecordByIds(ids));
+    }
 }

airport-admin/src/main/java/com/sundot/airport/web/controller/attendance/api/AttendanceController.java

@@ -16,6 +16,7 @@ import com.sundot.airport.system.service.ISysConfigService;
 import com.sundot.airport.web.core.cache.UserCache;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -60,4 +61,13 @@ public class AttendanceController extends BaseController {
     public AjaxResult recordList(@RequestBody AttendanceRecordReq dto) {
         return success(attendanceRecordService.recordList(dto));
     }
+
+    /**
+     * 查询可打卡类型:1=签到,2=签退
+     */
+    @GetMapping("/v1/getRecordType")
+    public AjaxResult getRecordType() {
+        return AjaxResult.success("操作成功", attendanceRecordService.getRecordType());
+    }
+
 }

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

@@ -23,6 +23,11 @@ public class AttendanceTeamUserRecord extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
+     * 主键
+     */
+    private Long id;
+
+    /**
      * 用户ID
      */
     @Excel(name = "用户ID")
@@ -79,6 +84,13 @@ public class AttendanceTeamUserRecord extends BaseEntity {
     @ApiModelProperty("考勤班组名称")
     private String attendanceTeamName;
 
+    /**
+     * 类型：1-已上通道，2-已下通道
+     */
+    @Excel(name = "类型：1-已上通道，2-已下通道")
+    @ApiModelProperty("类型：1-已上通道，2-已下通道")
+    private String checkInType;
+
     private Date attendanceDateStart;
 
     private Date attendanceDateEnd;

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

@@ -136,4 +136,12 @@ public interface AttendancePostRecordMapper {
      * @return
      */
     List<AttendancePostRecord> selectTeamOnList(@Param("date") Date date, @Param("attendanceTeamId") Long attendanceTeamId);
+
+    /**
+     * 查询指定用户最近的上岗记录的考勤日期
+     *
+     * @param userId 用户ID
+     * @return 考勤日期
+     */
+    public Date selectMaxDateByUserId(@Param("userId") Long userId);
 }

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

@@ -72,4 +72,20 @@ public interface AttendanceTeamUserRecordMapper {
      * @return 考勤班组成员列表
      */
     List<AttendanceTeamUserRecord> selectAttendanceTeamUserRecordByUserIdAndDateRange(Long userId, Date startDate, Date endDate);
+
+    /**
+     * 批量删除考勤班组成员
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAttendanceTeamUserRecordByIds(Long[] ids);
+
+    /**
+     * 查询指定用户最近维护班组长成员时的考勤日期
+     *
+     * @param attendanceTeamUserRecord 查询条件
+     * @return 考勤日期
+     */
+    public Date selectMaxDateBy(AttendanceTeamUserRecord attendanceTeamUserRecord);
 }

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

@@ -139,4 +139,12 @@ public interface IAttendancePostRecordService {
      * @return 时间
      */
     Map<String, Date> getShiftTime();
+
+    /**
+     * 查询指定用户最近的上岗记录的考勤日期
+     *
+     * @param userId 用户ID
+     * @return 考勤日期
+     */
+    public Date selectMaxDateByUserId(Long userId);
 }

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

@@ -92,4 +92,9 @@ public interface IAttendanceRecordService {
      * @return 计算出的考勤日期，表示该次打卡记录应归属的考勤周期日期
      */
     Date calculateAttendanceDate(Date checkInTime, String shiftStartTime, String shiftEndTime, String checkInType);
+
+    /**
+     * 查询可打卡类型:1=签到,2=签退
+     */
+    String getRecordType();
 }

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

@@ -82,5 +82,11 @@ public interface IAttendanceTeamUserRecordService {
      */
     List<Long> selectAttendanceTeamLeaderId();
 
-
+    /**
+     * 批量删除考勤班组成员
+     *
+     * @param ids 需要删除的考勤班组成员主键集合
+     * @return 结果
+     */
+    public int deleteAttendanceTeamUserRecordByIds(Long[] ids);
 }

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

@@ -267,5 +267,14 @@ public class AttendancePostRecordServiceImpl implements IAttendancePostRecordSer
         }
     }
 
-
+    /**
+     * 查询指定用户最近的上岗记录的考勤日期
+     *
+     * @param userId 用户ID
+     * @return 考勤日期
+     */
+    @Override
+    public Date selectMaxDateByUserId(Long userId) {
+        return attendancePostRecordMapper.selectMaxDateByUserId(userId);
+    }
 }

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

@@ -5,24 +5,32 @@ 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.AttendancePostRecord;
 import com.sundot.airport.attendance.domain.AttendanceRecord;
+import com.sundot.airport.attendance.domain.AttendanceTeamUserRecord;
 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.IAttendancePostRecordService;
 import com.sundot.airport.attendance.service.IAttendanceRecordService;
+import com.sundot.airport.attendance.service.IAttendanceTeamUserRecordService;
+import com.sundot.airport.common.core.domain.entity.SysRole;
 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.enums.RoleTypeEnum;
 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 lombok.extern.slf4j.Slf4j;
 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 org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -39,9 +47,14 @@ import java.util.stream.Collectors;
  * @author wangchong
  * @date 2025-07-10
  */
+@Slf4j
 @Service
 public class AttendanceRecordServiceImpl implements IAttendanceRecordService {
     @Autowired
+    private IAttendancePostRecordService attendancePostRecordService;
+    @Autowired
+    private IAttendanceTeamUserRecordService attendanceTeamUserRecordService;
+    @Autowired
     private AttendanceRecordMapper attendanceRecordMapper;
 
     @Autowired
@@ -132,21 +145,23 @@ public class AttendanceRecordServiceImpl implements IAttendanceRecordService {
      * @param userInfo 登录用户
      * @return 今日打卡历史
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public List<AttendanceCheckRecord> record(AttendanceRecordDTO dto, UserInfo userInfo) {
+        // 考勤记录数据检查
+        checkData(dto, 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 (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);
+            List<AttendanceRecord> attendanceRecords = queryRecordListNew(dtoReq);
             if (CollectionUtil.isNotEmpty(attendanceRecords)) {
                 AttendanceRecord lastRecord = attendanceRecords.get(0);
                 dto.setCheckInDate(lastRecord.getAttendanceDate());
@@ -168,7 +183,7 @@ public class AttendanceRecordServiceImpl implements IAttendanceRecordService {
         checkRecord.setCreateTime(new Date());
 
         // 处理梭班
-        processShuttleShiftLogic(checkRecord, userInfo);
+//        processShuttleShiftLogic(checkRecord, userInfo);
         // 保存打卡记录
         attendanceCheckRecordMapper.insertAttendanceCheckRecord(checkRecord);
 
@@ -188,19 +203,64 @@ public class AttendanceRecordServiceImpl implements IAttendanceRecordService {
         }
 
         // 处理考勤记录
-        AttendanceRecord search = new AttendanceRecord();
-        search.setUserId(userInfo.getUserId());
-        search.setAttendanceDate(dto.getCheckInDate());
-        List<AttendanceRecord> attendanceCheckRecords = attendanceRecordMapper.selectAttendanceRecordList(search);
-        if (CollectionUtil.isEmpty(attendanceCheckRecords)) {
+        if (StrUtil.equals("1", dto.getCheckInType())) {
             AttendanceRecord attendanceRecord = getAttendanceRecord(dto, userInfo);
             attendanceRecordMapper.insertAttendanceRecord(attendanceRecord);
         } else {
+            AttendanceRecord search = new AttendanceRecord();
+            search.setUserId(userInfo.getUserId());
+            search.setAttendanceDate(dto.getCheckInDate());
+            List<AttendanceRecord> attendanceCheckRecords = attendanceRecordMapper.selectAttendanceRecordList(search);
             AttendanceRecord attendanceRecord = getAttendanceRecord(userInfo, attendanceCheckRecords);
             attendanceRecord.setRemark(attendanceRecord.getRemark() + "\n" + dto.getRemark());
             attendanceRecordMapper.updateAttendanceRecord(attendanceRecord);
         }
 
+        // 签退处理上岗记录表+考勤班组成员表
+        if (StrUtil.equals("2", dto.getCheckInType())) {
+            List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+            if (CollectionUtil.isNotEmpty(roles)) {
+                List<String> roleKeyList = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toList());
+                if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode()) || roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
+                    // 处理上岗记录表
+                    // 查询在该时间段内未签退的记录
+                    AttendancePostRecord queryParam = new AttendancePostRecord();
+                    queryParam.setCreateBy(SecurityUtils.getUserId().toString());
+                    queryParam.setCheckOutTimeType(1); // 未签退的记录
+                    List<AttendancePostRecord> records = attendancePostRecordService.selectAttendancePostRecordList(queryParam);
+                    // 自动签退这些记录
+                    Date autoCheckOutTime = DateUtils.getNowDate();
+                    int count = 0;
+                    for (AttendancePostRecord record : records) {
+                        try {
+                            record.setCheckOutTime(autoCheckOutTime);
+                            record.setWorkDuration((autoCheckOutTime.getTime() - record.getCheckInTime().getTime()) / 1000 / 60);
+                            record.setUpdateBy(SecurityUtils.getUserId().toString());
+                            record.setUpdateTime(new Date());
+                            record.setRemark((record.getRemark() != null ? record.getRemark() : "") + " 系统自动签退");
+                            record.setLocked(false);
+                            attendancePostRecordService.updateAttendancePostRecord(record);
+                            count++;
+                        } catch (Exception e) {
+                            log.error("自动签退记录失败，ID: " + record.getId(), e);
+                        }
+                    }
+                    log.info("自动下通道任务执行完成，共处理 {} 条记录", count);
+
+                    // 处理考勤班组成员表
+                    AttendanceTeamUserRecord queryAttendanceTeamUserRecord = new AttendanceTeamUserRecord();
+                    queryAttendanceTeamUserRecord.setCreateBy(SecurityUtils.getUsername());
+                    queryAttendanceTeamUserRecord.setCheckInType("1");
+                    List<AttendanceTeamUserRecord> attendanceTeamUserRecordList = attendanceTeamUserRecordService.selectAttendanceTeamUserRecordList(queryAttendanceTeamUserRecord);
+                    attendanceTeamUserRecordList.forEach(attendanceTeamUserRecord -> {
+                        attendanceTeamUserRecord.setUpdateBy(SecurityUtils.getUsername());
+                        attendanceTeamUserRecord.setCheckInType("2");
+                        attendanceTeamUserRecordService.updateAttendanceTeamUserRecord(attendanceTeamUserRecord);
+                    });
+                }
+            }
+        }
+
         AttendanceCheckRecord checkSearch = new AttendanceCheckRecord();
         checkSearch.setUserId(userInfo.getUserId());
         checkRecord.setCheckInDate(dto.getCheckInDate());
@@ -220,6 +280,10 @@ public class AttendanceRecordServiceImpl implements IAttendanceRecordService {
             attendanceRecord.setDepartmentCode(userInfo.getDepartmentId().toString());
         }
         attendanceRecord.setDepartmentName(userInfo.getDepartmentName());
+        if (Objects.nonNull(userInfo.getBrigadeId())) {
+            attendanceRecord.setBrigadeCode(userInfo.getBrigadeId().toString());
+        }
+        attendanceRecord.setBrigadeName(userInfo.getBrigadeName());
         if (Objects.nonNull(userInfo.getStationId())) {
             attendanceRecord.setStationCode(userInfo.getStationId().toString());
         }
@@ -262,7 +326,7 @@ public class AttendanceRecordServiceImpl implements IAttendanceRecordService {
             // 计算查询时间范围
             Date yesterday = DateUtils.addDays(targetAttendanceDate, -1);
             // 设置查询条件
-            recordSearch.setAttendanceDateStart(yesterday);
+            recordSearch.setAttendanceDateStart(targetAttendanceDate);
             recordSearch.setAttendanceDateEnd(targetAttendanceDate);
         } else {
             recordSearch.setAttendanceDateStart(dto.getStartDate());
@@ -308,6 +372,7 @@ public class AttendanceRecordServiceImpl implements IAttendanceRecordService {
      * @param checkInType    打卡类型：1-上班打卡，2-下班打卡
      * @return 计算出的考勤日期，该次打卡记录应归属的考勤周期日期
      */
+    @Override
     public Date calculateAttendanceDate(Date checkInTime, String shiftStartTime, String shiftEndTime, String checkInType) {
         // 参数校验
         if (checkInTime == null || shiftStartTime == null || shiftEndTime == null) {
@@ -476,5 +541,52 @@ public class AttendanceRecordServiceImpl implements IAttendanceRecordService {
         return attendanceRecordMapper.selectAttendanceRecordList(recordSearch);
     }
 
+    /**
+     * 考勤记录数据检查
+     *
+     * @param dto
+     * @param userInfo
+     */
+    private void checkData(AttendanceRecordDTO dto, UserInfo userInfo) {
+        AttendanceRecordReq dtoReq = new AttendanceRecordReq();
+        dtoReq.setUserId(userInfo.getUserId());
+        List<AttendanceRecord> attendanceRecords = queryRecordListNew(dtoReq);
+        if (StrUtil.equals("1", dto.getCheckInType())) {
+            if (CollectionUtil.isNotEmpty(attendanceRecords) && attendanceRecords.get(0).getCheckOutTime() == null) {
+                throw new ServiceException("请勿重复打上班卡");
+            }
+        } else if (StrUtil.equals("2", dto.getCheckInType())) {
+            if (CollectionUtil.isEmpty(attendanceRecords) || attendanceRecords.get(0).getCheckOutTime() != null) {
+                throw new ServiceException("请勿重复打下班卡");
+            }
+        } else {
+            throw new ServiceException("打卡类型错误");
+        }
+    }
+
+    /**
+     * 查询考勤记录列表
+     */
+    private List<AttendanceRecord> queryRecordListNew(AttendanceRecordReq dto) {
+        AttendanceRecord recordSearch = new AttendanceRecord();
+        recordSearch.setUserId(dto.getUserId());
+        return attendanceRecordMapper.selectAttendanceRecordList(recordSearch);
+    }
 
+    /**
+     * 查询可打卡类型:1=签到,2=签退
+     */
+    @Override
+    public String getRecordType() {
+        AttendanceRecordReq dtoReq = new AttendanceRecordReq();
+        dtoReq.setUserId(SecurityUtils.getUserId());
+        List<AttendanceRecord> attendanceRecords = queryRecordListNew(dtoReq);
+        if (CollectionUtil.isEmpty(attendanceRecords)) {
+            return "1";
+        }
+        if (attendanceRecords.get(0).getCheckOutTime() != null) {
+            return "1";
+        }
+        return "2";
+    }
 }

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

@@ -19,6 +19,7 @@ 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 org.springframework.transaction.annotation.Transactional;
 
 import static com.sundot.airport.common.utils.SecurityUtils.getUsername;
 
@@ -64,26 +65,32 @@ public class AttendanceTeamUserRecordServiceImpl implements IAttendanceTeamUserR
     @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("日期格式化错误");
-            }
+//        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("日期格式化错误");
+//            }
+//        }
+        attendanceTeamUserRecord.setCreateBy(getUsername());
+        attendanceTeamUserRecord.setCheckInType("1");
+        Date maxDate = attendanceTeamUserRecordMapper.selectMaxDateBy(attendanceTeamUserRecord);
+        if (maxDate != null) {
+            attendanceTeamUserRecord.setAttendanceDate(maxDate);
         }
         return attendanceTeamUserRecordMapper.selectAttendanceTeamUserRecordList(attendanceTeamUserRecord);
     }
@@ -141,6 +148,7 @@ public class AttendanceTeamUserRecordServiceImpl implements IAttendanceTeamUserR
      * @param attendanceTeamUserRecord
      * @return
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public int insertAttendanceTeamUserRecordList(List<AttendanceTeamUserRecord> attendanceTeamUserRecord) {
         List<String> userName = new ArrayList<>();
@@ -161,27 +169,43 @@ public class AttendanceTeamUserRecordServiceImpl implements IAttendanceTeamUserR
             // 构建查询条件
             AttendanceTeamUserRecord searchRecord = new AttendanceTeamUserRecord();
             searchRecord.setUserId(record.getUserId());
-            searchRecord.setAttendanceDateStart(startDate);
-            searchRecord.setAttendanceDateEnd(endDate);
+//            searchRecord.setAttendanceDateStart(startDate);
+//            searchRecord.setAttendanceDateEnd(endDate);
+            searchRecord.setAttendanceDate(record.getAttendanceDate());
+            searchRecord.setCheckInType("1");
 
             // 查询时间范围内的记录
             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 (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 (!CollectionUtil.isEmpty(existingRecords)) {
+                userName.add(existingRecords.get(0).getUserName());
             }
         });
         if (userName.size() > 0) {
-            throw new ServiceException(StrUtil.format("用户{}在当前班次周期内已维护", JSONArray.toJSONString(userName)));
+            throw new ServiceException(StrUtil.format("用户【{}】在当前班次周期内已维护", String.join(",", userName)));
+        }
+
+        // 先删除后新增
+        AttendanceTeamUserRecord oldSearchRecord = new AttendanceTeamUserRecord();
+        oldSearchRecord.setCreateBy(attendanceTeamUserRecord.get(0).getCreateBy());
+        oldSearchRecord.setAttendanceDate(attendanceTeamUserRecord.get(0).getAttendanceDate());
+        List<AttendanceTeamUserRecord> oldList = attendanceTeamUserRecordMapper.selectAttendanceTeamUserRecordList(oldSearchRecord);
+        if (CollectionUtil.isNotEmpty(oldList)) {
+            Long[] oldIdArray = oldList.stream().map(AttendanceTeamUserRecord::getId).toArray(Long[]::new);
+            attendanceTeamUserRecordMapper.deleteAttendanceTeamUserRecordByIds(oldIdArray);
         }
         return attendanceTeamUserRecordMapper.insertAttendanceTeamUserRecordList(attendanceTeamUserRecord);
     }
@@ -265,4 +289,14 @@ public class AttendanceTeamUserRecordServiceImpl implements IAttendanceTeamUserR
         }
     }
 
+    /**
+     * 批量删除考勤班组成员
+     *
+     * @param ids 需要删除的考勤班组成员主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAttendanceTeamUserRecordByIds(Long[] ids) {
+        return attendanceTeamUserRecordMapper.deleteAttendanceTeamUserRecordByIds(ids);
+    }
 }

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

@@ -40,6 +40,7 @@
         <result property="statusDesc" column="status_desc"/>
         <result property="positionCode" column="position_code"/>
         <result property="positionName" column="position_name"/>
+        <result property="locked" column="locked"/>
     </resultMap>
 
     <sql id="selectAttendancePostRecordVo">
@@ -77,7 +78,8 @@
                remark,
                status_desc,
                position_code,
-               position_name
+               position_name,
+               locked
         from attendance_post_record
     </sql>
 
@@ -87,6 +89,7 @@
         <where>
             <if test="tenantId != null  and tenantId != ''">and tenant_id = #{tenantId}</if>
             <if test="revision != null ">and revision = #{revision}</if>
+            <if test="createBy != null ">and create_by = #{createBy}</if>
             <if test="userId != null ">and user_id = #{userId}</if>
             <if test="channelCode != null  and channelCode != ''">and channel_code = #{channelCode}</if>
             <if test="shiftCode != null  and shiftCode != ''">and shift_code = #{shiftCode}</if>
@@ -102,7 +105,7 @@
             <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="attendanceDate != null ">and attendance_date = #{attendanceDate}</if>
+            <if test="attendanceDate != null ">and DATE(attendance_date) = DATE(#{attendanceDate})</if>
             <if test="attendanceTeamId != null ">and attendance_team_id = #{attendanceTeamId}</if>
             <if test="overDuration != null ">and over_duration = #{overDuration}</if>
             <if test="attendanceTeamName != null  and attendanceTeamName != ''">and attendance_team_name like
@@ -274,6 +277,7 @@
             <if test="statusDesc != null and statusDesc != ''">status_desc = #{statusDesc},</if>
             <if test="positionCode != null">position_code = #{positionCode},</if>
             <if test="positionName != null">position_name = #{positionName},</if>
+            <if test="locked != null">locked = #{locked},</if>
         </trim>
         where id = #{id}
     </update>
@@ -404,4 +408,10 @@
             )
         </where>
     </select>
+
+    <select id="selectMaxDateByUserId" resultType="java.util.Date">
+        select max(attendance_date) attendance_date
+        from attendance_post_record
+        where user_id = #{userId}
+    </select>
 </mapper>

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

@@ -87,7 +87,7 @@
             </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="attendanceDate != null ">and DATE(attendance_date) = DATE(#{attendanceDate})</if>
             <if test="overDuration != null ">and over_duration = #{overDuration}</if>
             <if test="statusDesc != null  and statusDesc != ''">and status_desc = #{statusDesc}</if>
 

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

@@ -5,6 +5,7 @@
 <mapper namespace="com.sundot.airport.attendance.mapper.AttendanceTeamUserRecordMapper">
 
     <resultMap type="AttendanceTeamUserRecord" id="AttendanceTeamUserRecordResult">
+        <result property="id" column="id"/>
         <result property="userId" column="user_id"/>
         <result property="userCode" column="user_code"/>
         <result property="userName" column="user_name"/>
@@ -18,10 +19,12 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
+        <result property="checkInType" column="check_in_type"/>
     </resultMap>
 
     <sql id="selectAttendanceTeamUserRecordVo">
-        select user_id,
+        select id,
+               user_id,
                user_code,
                user_name,
                terminl_code,
@@ -33,7 +36,8 @@
                create_time,
                update_by,
                update_time,
-               remark
+               remark,
+               check_in_type
         from attendance_team_user_record
     </sql>
 
@@ -48,7 +52,7 @@
             <if test="terminlName != null  and terminlName != ''">and terminl_name like concat('%', #{terminlName},
                 '%')
             </if>
-            <if test="attendanceDate != null ">and attendance_date = #{attendanceDate}</if>
+            <if test="attendanceDate != null ">and DATE(attendance_date) = DATE(#{attendanceDate})</if>
             <!-- 添加时间范围查询支持 -->
             <if test="attendanceDateStart != null ">and create_time >= #{attendanceDateStart}</if>
             <if test="attendanceDateEnd != null ">and create_time &lt;= #{attendanceDateEnd}</if>
@@ -56,6 +60,7 @@
             <if test="attendanceTeamName != null  and attendanceTeamName != ''">and attendance_team_name like
                 concat('%', #{attendanceTeamName}, '%')
             </if>
+            <if test="checkInType != null and checkInType != ''">and check_in_type = #{checkInType}</if>
         </where>
         order by create_time desc
     </select>
@@ -82,6 +87,7 @@
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
+            <if test="checkInType != null">check_in_type,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="userId != null">#{userId},</if>
@@ -97,6 +103,7 @@
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="checkInType != null">#{checkInType},</if>
         </trim>
     </insert>
 
@@ -115,8 +122,9 @@
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="checkInType != null">check_in_type = #{checkInType},</if>
         </trim>
-        where user_id = #{userId}
+        where id = #{id}
     </update>
 
     <delete id="deleteAttendanceTeamUserRecordByUserId" parameterType="Long">
@@ -145,7 +153,8 @@
     </insert>
 
     <select id="selectAttendanceTeamUserRecordByUserIdAndDateRange" resultMap="AttendanceTeamUserRecordResult">
-        SELECT tenant_id,
+        SELECT id,
+               tenant_id,
                revision,
                create_by,
                create_time,
@@ -159,12 +168,34 @@
                attendance_date,
                attendance_team_id,
                attendance_team_name,
-               remark
+               remark,
+               check_in_type
         FROM attendance_team_user_record
         WHERE user_id = #{userId}
           AND attendance_date >= #{startDate}
           AND attendance_date &lt;= #{endDate}
     </select>
 
+    <delete id="deleteAttendanceTeamUserRecordByIds" parameterType="String">
+        delete from attendance_team_user_record where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
 
+    <select id="selectMaxDateBy" parameterType="AttendanceTeamUserRecord" resultType="java.util.Date">
+        select max(attendance_date) attendance_date
+        from attendance_team_user_record
+        <where>
+            <if test="checkInType != null and checkInType != ''">
+                and check_in_type = #{checkInType}
+            </if>
+            <if test="createBy != null and createBy != ''">
+                and create_by = #{createBy}
+            </if>
+            <if test="attendanceTeamId != null">
+                and attendance_team_id = #{attendanceTeamId}
+            </if>
+        </where>
+    </select>
 </mapper>