格式化代码

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

@@ -21,6 +21,7 @@ public class AttendanceAreaController extends BaseController {
 
     /**
      * 查询是否在考勤范围
+     *
      * @param lng 经度
      * @param lat 纬度
      * @return
@@ -28,7 +29,7 @@ public class AttendanceAreaController extends BaseController {
     @PostMapping("/check-in")
     public AjaxResult checkUserInValidArea(@RequestParam BigDecimal lng,
                                            @RequestParam BigDecimal lat) {
-        List<AttendanceArea> validAreas =  attendanceService.checkUserInValidArea(lng, lat);
+        List<AttendanceArea> validAreas = attendanceService.checkUserInValidArea(lng, lat);
         if (CollectionUtil.isEmpty(validAreas)) {
             return AjaxResult.error("不在任何考勤范围内");
         }
@@ -37,11 +38,12 @@ public class AttendanceAreaController extends BaseController {
 
     /**
      * 考勤打卡列表
+     *
      * @return
      */
     @PostMapping("/list")
     public AjaxResult areaList() {
-        List<AttendanceArea> validAreas =  attendanceService.areaList();
+        List<AttendanceArea> validAreas = attendanceService.areaList();
         if (CollectionUtil.isEmpty(validAreas)) {
             return AjaxResult.error("没有考勤范围");
         }

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

@@ -80,9 +80,6 @@ public class AttendancePostRecordController extends BaseController {
     private ISysConfigService configService;
 
 
-
-
-
     /**
      * 查询上岗记录列表
      */
@@ -135,11 +132,11 @@ public class AttendancePostRecordController extends BaseController {
 
         // 获取当前用户的所有班次代码
         List<String> shiftCodes = userRecords.stream()
-            .map(AttendancePostRecord::getShiftCode)
-            .filter(Objects::nonNull)
-            .filter(code -> !code.isEmpty())
-            .distinct()
-            .collect(Collectors.toList());
+                .map(AttendancePostRecord::getShiftCode)
+                .filter(Objects::nonNull)
+                .filter(code -> !code.isEmpty())
+                .distinct()
+                .collect(Collectors.toList());
 
         // 如果没有班次信息，返回空结果
         if (shiftCodes.isEmpty()) {
@@ -151,8 +148,8 @@ public class AttendancePostRecordController extends BaseController {
 
         // 按 shift_code 分组，并转换为数组格式
         Map<String, List<AttendancePostRecord>> groupedByShift = allShiftRecords.stream()
-            .filter(record -> record.getShiftCode() != null && !record.getShiftCode().isEmpty())
-            .collect(Collectors.groupingBy(AttendancePostRecord::getShiftCode));
+                .filter(record -> record.getShiftCode() != null && !record.getShiftCode().isEmpty())
+                .collect(Collectors.groupingBy(AttendancePostRecord::getShiftCode));
 
         // 转换为数组格式
         List<Map<String, Object>> result = new ArrayList<>();
@@ -162,10 +159,10 @@ public class AttendancePostRecordController extends BaseController {
             shiftGroup.put("records", records);
             // 获取该班次中最早的签到时间用于排序
             Date earliestCheckInTime = records.stream()
-                .map(AttendancePostRecord::getCheckInTime)
-                .filter(Objects::nonNull)
-                .min(Date::compareTo)
-                .orElse(new Date());
+                    .map(AttendancePostRecord::getCheckInTime)
+                    .filter(Objects::nonNull)
+                    .min(Date::compareTo)
+                    .orElse(new Date());
             shiftGroup.put("earliestCheckInTime", earliestCheckInTime);
             result.add(shiftGroup);
         });
@@ -191,30 +188,30 @@ public class AttendancePostRecordController extends BaseController {
     public AjaxResult getLocationsByTime(@RequestBody Map<String, String> requestBody) {
         try {
             Long currentUserId = SecurityUtils.getUserId();
-            
+
             // 从请求体中获取时间参数
             String searchTime = requestBody.get("searchtime");
             if (StringUtils.isEmpty(searchTime)) {
                 return AjaxResult.error("请提供 searchtime 参数");
             }
-            
+
             // 解析时间参数
             Date queryTime = DateUtil.parse(searchTime, "yyyy-MM-dd HH:mm:ss");
-            
+
             // 打印调试信息
             System.out.println("=== 调试信息 ===");
             System.out.println("当前用户ID: " + currentUserId);
             System.out.println("查询时间参数: " + searchTime);
             System.out.println("解析后的时间: " + queryTime);
             System.out.println("时间戳: " + queryTime.getTime());
-            
+
             List<AttendancePostRecord> locations = attendancePostRecordService.selectLocationsByTime(currentUserId, queryTime);
-            
+
             System.out.println("查询结果数量: " + locations.size());
             System.out.println("===============");
-            
+
             return AjaxResult.success(locations);
-            
+
         } catch (Exception e) {
             System.out.println("接口异常: " + e.getMessage());
             return AjaxResult.error("时间格式错误，请使用 yyyy-MM-dd HH:mm:ss 格式");
@@ -369,7 +366,7 @@ public class AttendancePostRecordController extends BaseController {
             count.addAndGet(attendancePostRecordService.insertAttendancePostRecord(record));
         });
 
-        
+
         return toAjax(count.get());
     }
 
@@ -392,13 +389,13 @@ public class AttendancePostRecordController extends BaseController {
             extracted(postRecord);
             // 判断是否已签退
             LocalDateTime baseDateTime = LocalDateTime.of(2000, 1, 1, 0, 0, 0);
-            if(postRecord.getCheckOutTime().after(Date.from(baseDateTime.atZone(ZoneId.systemDefault()).toInstant()))){
+            if (postRecord.getCheckOutTime().after(Date.from(baseDateTime.atZone(ZoneId.systemDefault()).toInstant()))) {
                 postRecord.setLocked(false);
             }
-            count+=attendancePostRecordService.updateAttendancePostRecord(postRecord);
+            count += attendancePostRecordService.updateAttendancePostRecord(postRecord);
         }
 
-        
+
         return toAjax(count);
     }
 
@@ -657,7 +654,7 @@ public class AttendancePostRecordController extends BaseController {
     @PostMapping("/count")
     public AttendanceRecordCountDTO attendanceRecordCount(String regionalStatus) {
         AttendanceRecordCountDTO dto = new AttendanceRecordCountDTO();
-        List<String> regionalCodes =new ArrayList<>();
+        List<String> regionalCodes = new ArrayList<>();
         //判断是不是科长和获取用户关联的区域编码
         boolean kezhang = isKezhang(regionalStatus, regionalCodes);
         if (kezhang && CollectionUtil.isEmpty(regionalCodes)) {
@@ -696,10 +693,11 @@ public class AttendancePostRecordController extends BaseController {
 
         return dto;
     }
+
     /**
      * 查询是否是科长
      */
-    private boolean isKezhang(String regionalStatus,List<String> regionalCodes) {
+    private boolean isKezhang(String regionalStatus, List<String> regionalCodes) {
 
         if (!StringUtils.equals(regionalStatus, "1")) {
             return false;
@@ -718,15 +716,15 @@ public class AttendancePostRecordController extends BaseController {
         List<String> roleKeyList = roles.stream()
                 .map(SysRole::getRoleKey)
                 .collect(Collectors.toList());
-        if(roleKeyList.contains(RoleTypeEnum.kezhang.getCode())){
+        if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
             Map<String, Date> shiftTime = attendancePostRecordService.getShiftTime();
             Date shiftStartTime = shiftTime.get("start");
             Date shiftEndTime = shiftTime.get("end");
             List<AttendancePostRecord> regionalList = attendancePostRecordService
-                    .selectKezhangRecordCount(user.getUserId(),shiftStartTime,shiftEndTime);
-            regionalCodes .addAll(regionalList.stream()
+                    .selectKezhangRecordCount(user.getUserId(), shiftStartTime, shiftEndTime);
+            regionalCodes.addAll(regionalList.stream()
                     .map(AttendancePostRecord::getRegionalCode)
-                    .collect(Collectors.toList())) ;
+                    .collect(Collectors.toList()));
             return true;
         }
         return false;
@@ -744,7 +742,7 @@ public class AttendancePostRecordController extends BaseController {
         Date shiftStartTime = shiftTime.get("start");
         Date shiftEndTime = shiftTime.get("end");
         return attendancePostRecordService
-                .selectLocationsByTimeAndChannelName(channelCodeList, DateUtils.getNowDate(),shiftStartTime, shiftEndTime);
+                .selectLocationsByTimeAndChannelName(channelCodeList, DateUtils.getNowDate(), shiftStartTime, shiftEndTime);
     }
 
     /**
@@ -766,10 +764,11 @@ public class AttendancePostRecordController extends BaseController {
 
     /**
      * 构建航站楼详细统计信息
-     * @param terminalCode 航站楼编码
-     * @param channelList 通道列表
+     *
+     * @param terminalCode  航站楼编码
+     * @param channelList   通道列表
      * @param onDutyRecords 在岗记录
-     * @param maintainList 维护人员记录
+     * @param maintainList  维护人员记录
      * @return 航站楼详细统计信息
      */
     private AttendanceRecordTerminlCountDetailDTO buildTerminalDetail(
@@ -843,6 +842,7 @@ public class AttendancePostRecordController extends BaseController {
 
     /**
      * 构建区域详情列表
+     *
      * @param terminalOnDutyRecords 航站楼下的在岗记录
      */
     private List<AttendanceRecordCountRegionDTO> buildRegionDetails(
@@ -892,7 +892,7 @@ public class AttendancePostRecordController extends BaseController {
                 regionDTO.setTerminlCode(firstDetail.getTerminlCode());
                 regionDTO.setTerminlName(firstDetail.getTerminlName());
                 regionDTO.setOpenChannelCount(detailList.size());
-            }else {
+            } else {
                 regionDTO.setOpenChannelCount(0);
             }
 
@@ -994,25 +994,26 @@ public class AttendancePostRecordController extends BaseController {
 
     /**
      * 查询科长最后一次上岗记录
-     * @param userId   用户ID
+     *
+     * @param userId 用户ID
      */
     @PreAuthorize("@ss.hasPermi('attendance:postRecord:query:last:time')")
     @GetMapping("/query-last-time")
-    public AjaxResult queryLastTime( @RequestParam("userId") Long userId){
+    public AjaxResult queryLastTime(@RequestParam("userId") Long userId) {
         return AjaxResult.success(attendancePostRecordService.queryLastTime(userId));
     }
 
     /**
      * 查询当前班次下所有科长上岗记录
+     *
      * @return
      */
     @GetMapping("/queryKeIds")
-    public AjaxResult queryKeIds( ){
+    public AjaxResult queryKeIds() {
         return AjaxResult.success(attendancePostRecordService.queryKeIds());
     }
 
 
-
     /**
      * 根据当前时间确定所属班次日期
      * 班次周期：每日9:00到次日10:00
@@ -1054,9 +1055,9 @@ public class AttendancePostRecordController extends BaseController {
     }
 
 
-
     /**
      * 判断用户记录是否已锁定
+     *
      * @param userId 用户ID
      * @return 是否已锁定
      */
@@ -1077,6 +1078,7 @@ public class AttendancePostRecordController extends BaseController {
 
     /**
      * 判断当前时间是否在班次周期内（当日9:00 - 次日9:00）
+     *
      * @param lockTime 锁定时间
      * @return 是否在班次周期内
      */
@@ -1097,10 +1099,4 @@ public class AttendancePostRecordController extends BaseController {
     }
 
 
-
-
-
-
-
-
 }

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

@@ -45,7 +45,7 @@ public class AttendanceRecordController extends BaseController {
 
     @Autowired
     private UserCache userCache;
-    
+
     @Autowired
     private ISysDeptService sysDeptService;
 
@@ -75,7 +75,7 @@ public class AttendanceRecordController extends BaseController {
                 // 不设置过滤条件，查看所有数据
                 break;
         }
-        
+
         startPage();
         List<AttendanceRecord> list = attendanceRecordService.selectAttendanceRecordList(attendanceRecord);
         return getDataTable(list);
@@ -108,7 +108,7 @@ public class AttendanceRecordController extends BaseController {
                 // 不设置过滤条件，查看所有数据
                 break;
         }
-        
+
         List<AttendanceRecord> list = attendanceRecordService.selectAttendanceRecordList(attendanceRecord);
         ExcelUtil<AttendanceRecord> util = new ExcelUtil<AttendanceRecord>(AttendanceRecord.class);
         util.exportExcel(response, list, "考勤记录数据");

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

@@ -3,6 +3,7 @@ package com.sundot.airport.web.controller.attendance;
 import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -24,26 +25,25 @@ import com.sundot.airport.common.core.page.TableDataInfo;
 
 /**
  * 考勤班组成员Controller
- * 
+ *
  * @author ruoyi
  * @date 2025-09-06
  */
 @RestController
 @RequestMapping("/attendance/record")
-public class AttendanceTeamUserRecordController extends BaseController
-{
+public class AttendanceTeamUserRecordController extends BaseController {
     @Autowired
     private IAttendanceTeamUserRecordService attendanceTeamUserRecordService;
 
     /**
      * 查询考勤班组成员列表
+     *
      * @param attendanceTeamUserRecord
      * @return
      */
     @PreAuthorize("@ss.hasPermi('attendance:record:list')")
     @GetMapping("/pageList")
-    public TableDataInfo pageList(AttendanceTeamUserRecord attendanceTeamUserRecord)
-    {
+    public TableDataInfo pageList(AttendanceTeamUserRecord attendanceTeamUserRecord) {
         startPage();
         List<AttendanceTeamUserRecord> list = attendanceTeamUserRecordService.selectAttendanceTeamUserRecordPageList(attendanceTeamUserRecord);
         return getDataTable(list);
@@ -54,8 +54,7 @@ public class AttendanceTeamUserRecordController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('attendance:record:list')")
     @GetMapping("/list")
-    public TableDataInfo list(AttendanceTeamUserRecord attendanceTeamUserRecord)
-    {
+    public TableDataInfo list(AttendanceTeamUserRecord attendanceTeamUserRecord) {
         startPage();
         List<AttendanceTeamUserRecord> list = attendanceTeamUserRecordService.selectAttendanceTeamUserRecordList(attendanceTeamUserRecord);
         return getDataTable(list);
@@ -67,8 +66,7 @@ public class AttendanceTeamUserRecordController extends BaseController
     @PreAuthorize("@ss.hasPermi('attendance:record:export')")
     @Log(title = "考勤班组成员", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, AttendanceTeamUserRecord attendanceTeamUserRecord)
-    {
+    public void export(HttpServletResponse response, AttendanceTeamUserRecord attendanceTeamUserRecord) {
         List<AttendanceTeamUserRecord> list = attendanceTeamUserRecordService.selectAttendanceTeamUserRecordList(attendanceTeamUserRecord);
         ExcelUtil<AttendanceTeamUserRecord> util = new ExcelUtil<AttendanceTeamUserRecord>(AttendanceTeamUserRecord.class);
         util.exportExcel(response, list, "考勤班组成员数据");
@@ -79,8 +77,7 @@ public class AttendanceTeamUserRecordController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('attendance:record:query')")
     @GetMapping(value = "/{userId}")
-    public AjaxResult getInfo(@PathVariable("userId") Long userId, @PathVariable("attendanceDate") Date attendanceDate)
-    {
+    public AjaxResult getInfo(@PathVariable("userId") Long userId, @PathVariable("attendanceDate") Date attendanceDate) {
         return success(attendanceTeamUserRecordService.selectAttendanceTeamUserRecordByUserId(userId, attendanceDate));
     }
 
@@ -90,8 +87,7 @@ public class AttendanceTeamUserRecordController extends BaseController
     @PreAuthorize("@ss.hasPermi('attendance:record:add')")
     @Log(title = "考勤班组成员", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody AttendanceTeamUserRecord attendanceTeamUserRecord)
-    {
+    public AjaxResult add(@RequestBody AttendanceTeamUserRecord attendanceTeamUserRecord) {
         return toAjax(attendanceTeamUserRecordService.insertAttendanceTeamUserRecord(attendanceTeamUserRecord));
     }
 
@@ -101,8 +97,7 @@ public class AttendanceTeamUserRecordController extends BaseController
     @PreAuthorize("@ss.hasPermi('attendance:record:edit')")
     @Log(title = "考勤班组成员", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody AttendanceTeamUserRecord attendanceTeamUserRecord)
-    {
+    public AjaxResult edit(@RequestBody AttendanceTeamUserRecord attendanceTeamUserRecord) {
         return toAjax(attendanceTeamUserRecordService.updateAttendanceTeamUserRecord(attendanceTeamUserRecord));
     }
 
@@ -111,22 +106,21 @@ public class AttendanceTeamUserRecordController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('attendance:record:remove')")
     @Log(title = "考勤班组成员", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{userIds}")
-    public AjaxResult remove(@PathVariable Long[] userIds)
-    {
+    @DeleteMapping("/{userIds}")
+    public AjaxResult remove(@PathVariable Long[] userIds) {
         return toAjax(attendanceTeamUserRecordService.deleteAttendanceTeamUserRecordByUserIds(userIds));
     }
 
     /**
-     *  批量新增考勤班组成员
+     * 批量新增考勤班组成员
+     *
      * @param attendanceTeamUserRecord
      * @return
      */
     @PreAuthorize("@ss.hasPermi('attendance:record:add:list')")
     @Log(title = "考勤班组成员", businessType = BusinessType.INSERT)
     @PostMapping(value = "/add/list")
-    public AjaxResult addList(@RequestBody List<AttendanceTeamUserRecord> attendanceTeamUserRecord)
-    {
+    public AjaxResult addList(@RequestBody List<AttendanceTeamUserRecord> attendanceTeamUserRecord) {
         return toAjax(attendanceTeamUserRecordService.insertAttendanceTeamUserRecordList(attendanceTeamUserRecord));
     }
 
@@ -134,8 +128,7 @@ public class AttendanceTeamUserRecordController extends BaseController
      * 获取考勤班组成员列表
      */
     @GetMapping("/list/teamLeader")
-    public AjaxResult listTeamLeader()
-    {
+    public AjaxResult listTeamLeader() {
         return success(attendanceTeamUserRecordService.selectAttendanceTeamLeaderId());
     }
 

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

@@ -11,7 +11,7 @@ import java.math.BigDecimal;
  * 打卡范围
  */
 @Data
-@ApiModel(value = "AttendanceArea对象",description = "打卡范围")
+@ApiModel(value = "AttendanceArea对象", description = "打卡范围")
 public class AttendanceArea extends BaseEntity {
     /**
      * 主键id

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

@@ -245,5 +245,4 @@ public class AttendancePostRecord extends BaseEntity {
     private Date endTime;
 
 
-
 }

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

@@ -1,6 +1,7 @@
 package com.sundot.airport.attendance.domain;
 
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,60 +13,75 @@ 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
-{
+public class AttendanceTeamUserRecord extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 用户ID */
+    /**
+     * 用户ID
+     */
     @Excel(name = "用户ID")
     @ApiModelProperty("用户ID")
     private Long userId;
 
-    /** 用户code */
+    /**
+     * 用户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 */
+    /**
+     * 考勤班组ID
+     */
     @Excel(name = "考勤班组ID")
     @ApiModelProperty("考勤班组ID")
     private Long attendanceTeamId;
 
-    /** 考勤班组名称 */
+    /**
+     * 考勤班组名称
+     */
     @Excel(name = "考勤班组名称")
     @ApiModelProperty("考勤班组名称")
     private String attendanceTeamName;
 
-    private  Date attendanceDateStart;
+    private Date attendanceDateStart;
 
-    private  Date attendanceDateEnd;
+    private Date attendanceDateEnd;
 
 
 }

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

@@ -14,33 +14,33 @@ 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

@@ -10,9 +10,13 @@ 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

@@ -10,9 +10,13 @@ import java.math.BigDecimal;
  */
 @Data
 public class WorkHoursStats {
-    /** 总上岗时长(小时) */
+    /**
+     * 总上岗时长(小时)
+     */
     private Long totalWorkingHours;
-    
-    /** 平均上岗时长 */
+
+    /**
+     * 平均上岗时长
+     */
     private BigDecimal averagePersonnel;
 }

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

@@ -40,7 +40,7 @@ public class AttendanceRecordCountDetailDTO {
     private Integer onDutyCount;
 
     @ApiModelProperty("在岗班组")
-     private String onDutyTeamName;
+    private String onDutyTeamName;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("上岗时间")

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

@@ -20,7 +20,7 @@ public class AttendanceRecordCountRegionDTO {
     private String regionalName;
 
     @ApiModelProperty("开放人数量")
-    private Integer  openUserCount;
+    private Integer openUserCount;
 
     @ApiModelProperty("开放通道数")
     private Integer openChannelCount;

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

@@ -36,7 +36,4 @@ public class AttendanceRecordTerminlCountDetailDTO {
     private List<AttendanceRecordCountWaitDTO> waitList;
 
 
-
-
-
 }

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

@@ -9,7 +9,6 @@ import java.util.List;
 public interface AttendanceAreaMapper {
 
     /**
-     *
      * @param lng 用户经度
      * @param lat 用户纬度
      * @return 符合条件的考勤区域列表
@@ -20,6 +19,7 @@ public interface AttendanceAreaMapper {
 
     /**
      * 查询考勤列表
+     *
      * @return
      */
     List<AttendanceArea> areaList();

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

@@ -65,7 +65,7 @@ public interface AttendancePostRecordMapper {
      * 查询指定用户当天的上岗记录
      *
      * @param userId 用户ID
-     * @param today 当天日期
+     * @param today  当天日期
      * @return 上岗记录集合
      */
     public List<AttendancePostRecord> selectTodayRecordsByUserId(@Param("userId") Long userId, @Param("today") Date today);
@@ -73,7 +73,7 @@ public interface AttendancePostRecordMapper {
     /**
      * 查询指定班次代码当天的上岗记录
      *
-     * @param today 当天日期
+     * @param today      当天日期
      * @param shiftCodes 班次代码列表
      * @return 上岗记录集合
      */
@@ -82,22 +82,24 @@ public interface AttendancePostRecordMapper {
     /**
      * 根据指定时间获取用户的在岗位置信息
      *
-     * @param userId 用户ID
+     * @param userId    用户ID
      * @param queryTime 查询时间
      * @return 上岗记录集合
      */
     public List<AttendancePostRecord> selectLocationsByTime(@Param("userId") Long userId, @Param("queryTime") Date queryTime);
 
     /**
-     *  根据通道名称和指定时间获取通道的在岗位置信息
+     * 根据通道名称和指定时间获取通道的在岗位置信息
+     *
      * @param channelCodeList 通道code
-     * @param queryTime 查询时间
+     * @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
@@ -105,31 +107,33 @@ public interface AttendancePostRecordMapper {
     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 结束时间
+     * 查询指定时间段内所有考勤记录的ke_id
+     *
+     * @param startTime 开始时间
+     * @param endTime   结束时间
      * @return
      */
-    List<Long> queryKeIds(@Param("startTime")Date startTime, @Param("endTime") Date endTime);
+    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);
+    List<AttendancePostRecord> selectTeamOnList(@Param("date") Date date, @Param("attendanceTeamId") Long attendanceTeamId);
 }

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

@@ -2,28 +2,28 @@ 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 
-{
+public interface AttendanceTeamUserRecordMapper {
     /**
      * 查询考勤班组成员
-     * 
+     *
      * @param userId 考勤班组成员主键
      * @return 考勤班组成员
      */
-    public AttendanceTeamUserRecord selectAttendanceTeamUserRecordByUserId(@Param("userId")  Long userId, @Param("attendanceDate") Date attendanceDate);
+    public AttendanceTeamUserRecord selectAttendanceTeamUserRecordByUserId(@Param("userId") Long userId, @Param("attendanceDate") Date attendanceDate);
 
     /**
      * 查询考勤班组成员列表
-     * 
+     *
      * @param attendanceTeamUserRecord 考勤班组成员
      * @return 考勤班组成员集合
      */
@@ -31,7 +31,7 @@ public interface AttendanceTeamUserRecordMapper
 
     /**
      * 新增考勤班组成员
-     * 
+     *
      * @param attendanceTeamUserRecord 考勤班组成员
      * @return 结果
      */
@@ -39,7 +39,7 @@ public interface AttendanceTeamUserRecordMapper
 
     /**
      * 修改考勤班组成员
-     * 
+     *
      * @param attendanceTeamUserRecord 考勤班组成员
      * @return 结果
      */
@@ -47,7 +47,7 @@ public interface AttendanceTeamUserRecordMapper
 
     /**
      * 删除考勤班组成员
-     * 
+     *
      * @param userId 考勤班组成员主键
      * @return 结果
      */
@@ -55,19 +55,20 @@ public interface AttendanceTeamUserRecordMapper
 
     /**
      * 批量删除考勤班组成员
-     * 
+     *
      * @param userIds 需要删除的数据主键集合
      * @return 结果
      */
     public int deleteAttendanceTeamUserRecordByUserIds(Long[] userIds);
 
     int insertAttendanceTeamUserRecordList(List<AttendanceTeamUserRecord> attendanceTeamUserRecord);
+
     /**
      * 根据用户ID和时间范围查询考勤班组成员
      *
-     * @param userId 用户ID
+     * @param userId    用户ID
      * @param startDate 开始日期
-     * @param endDate 结束日期
+     * @param endDate   结束日期
      * @return 考勤班组成员列表
      */
     List<AttendanceTeamUserRecord> selectAttendanceTeamUserRecordByUserIdAndDateRange(Long userId, Date startDate, Date endDate);

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

@@ -13,19 +13,25 @@ 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

@@ -30,10 +30,10 @@ import javax.annotation.PostConstruct;
  */
 @Service
 public class AttendanceModuleIndicatorService extends AbstractModuleIndicatorService<AttendanceModuleIndicatorResult> {
-    
+
     @Autowired
     private Set<Indicator<?>> indicators;
-    
+
     @Autowired
     private AttendanceRecordMapper attendanceRecordMapper;
 
@@ -42,14 +42,14 @@ public class AttendanceModuleIndicatorService extends AbstractModuleIndicatorSer
 
     @Autowired
     private ISysDeptService sysDeptService;
-    
+
     private Set<IndicatorType> supportedIndicatorTypes = new HashSet<>();
-    
+
     @Override
     public String getModuleName() {
         return "attendance";
     }
-    
+
     @PostConstruct
     public void initSupportedIndicatorTypes() {
         // 初始化支持的指标类型
@@ -62,22 +62,22 @@ public class AttendanceModuleIndicatorService extends AbstractModuleIndicatorSer
             }
         }
     }
-    
+
     @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方法，将值设置到结果对象中

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

@@ -31,7 +31,7 @@ import java.util.stream.Collectors;
 @Service
 public class StationWorkStatsService {
 
-    
+
     @Autowired
     private ISysDeptService sysDeptService;
 
@@ -40,9 +40,10 @@ public class StationWorkStatsService {
 
     @Autowired
     private ISysUserService iSysUserService;
-    
+
     /**
      * 计算站级部门及其下属部门的工作统计数据
+     *
      * @param params 指定部门
      * @return 工作统计数据列表
      */
@@ -57,14 +58,14 @@ public class StationWorkStatsService {
         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))
+                .map(dept -> getStationDeptWorkStats(dept, indicatorCalculateParams))
                 .filter(java.util.Objects::nonNull)
                 .collect(Collectors.toList());
     }
@@ -81,9 +82,10 @@ public class StationWorkStatsService {
         params.setEndTime(endTime);
         return params;
     }
-    
+
     /**
      * 为特定部门生成工作统计信息
+     *
      * @param dept 部门信息
      * @return 部门工作统计信息
      */
@@ -91,7 +93,7 @@ public class StationWorkStatsService {
         if (dept == null) {
             return null;
         }
-        
+
         StationDeptWorkStats stationStats = new StationDeptWorkStats();
         stationStats.setDimension(dept.getDeptName());
         stationStats.setDeptId(dept.getDeptId());
@@ -114,9 +116,9 @@ public class StationWorkStatsService {
     }
 
 
-    private BigDecimal  avgWorkingDays(IndicatorCalculateParams params) {
+    private BigDecimal avgWorkingDays(IndicatorCalculateParams params) {
         BigDecimal avgWorkingDays = BigDecimal.ZERO;
-                ModularIndicatorResult indicators = userPortraitService.getIndicators(params, Arrays.asList("attendance"));
+        ModularIndicatorResult indicators = userPortraitService.getIndicators(params, Arrays.asList("attendance"));
         if (indicators == null) {
             return avgWorkingDays;
         }
@@ -129,7 +131,7 @@ public class StationWorkStatsService {
         Object workingDate = attendanceResult.getWorkingDate();
         if (workingDate instanceof WorkDateStats) {
             WorkDateStats workDateStats = (WorkDateStats) workingDate;
-             avgWorkingDays =    workDateStats.getAveragePersonnel() != null ?
+            avgWorkingDays = workDateStats.getAveragePersonnel() != null ?
                     workDateStats.getAveragePersonnel() : BigDecimal.ZERO;
         }
         return avgWorkingDays;
@@ -150,7 +152,7 @@ public class StationWorkStatsService {
         Object workingHours = attendanceResult.getWorkingHours();
         if (workingHours instanceof WorkHoursStats) {
             WorkHoursStats workHoursStats = (WorkHoursStats) workingHours;
-            avgWorkingHours=workHoursStats.getAveragePersonnel() != null ?
+            avgWorkingHours = workHoursStats.getAveragePersonnel() != null ?
                     workHoursStats.getAveragePersonnel() : BigDecimal.ZERO;
         }
 

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

@@ -22,12 +22,12 @@ 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();

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

@@ -89,13 +89,13 @@ public class WorkingHoursIndicator implements Indicator<Object> {
                     .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);
+            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) {

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

@@ -7,8 +7,8 @@ import java.util.List;
 
 public interface AttendanceAreaService {
     /**
-     *
      * 查询是否在考勤范围
+     *
      * @param lng 经度
      * @param lat 纬度
      * @return
@@ -16,7 +16,6 @@ public interface AttendanceAreaService {
     List<AttendanceArea> checkUserInValidArea(BigDecimal lng, BigDecimal lat);
 
     /**
-     *
      * @return
      */
     List<AttendanceArea> areaList();

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

@@ -66,7 +66,7 @@ public interface IAttendancePostRecordService {
      * 查询指定用户当天的上岗记录
      *
      * @param userId 用户ID
-     * @param today 当天日期
+     * @param today  当天日期
      * @return 上岗记录集合
      */
     public List<AttendancePostRecord> selectTodayRecordsByUserId(Long userId, Date today);
@@ -74,7 +74,7 @@ public interface IAttendancePostRecordService {
     /**
      * 查询指定班次代码当天的上岗记录
      *
-     * @param today 当天日期
+     * @param today      当天日期
      * @param shiftCodes 班次代码列表
      * @return 上岗记录集合
      */
@@ -83,7 +83,7 @@ public interface IAttendancePostRecordService {
     /**
      * 根据指定时间获取用户的在岗位置信息
      *
-     * @param userId 用户ID
+     * @param userId    用户ID
      * @param queryTime 查询时间
      * @return 上岗记录集合
      */
@@ -95,10 +95,11 @@ public interface IAttendancePostRecordService {
      * @param channelCodeList 通道code
      * @return 上岗记录集合
      */
-    List<AttendancePostRecord> selectLocationsByTimeAndChannelName(List<String> channelCodeList, Date nowDate,Date startTime,Date endTime);
+    List<AttendancePostRecord> selectLocationsByTimeAndChannelName(List<String> channelCodeList, Date nowDate, Date startTime, Date endTime);
 
     /**
      * 查询指定班次代码当天的下岗记录
+     *
      * @param today
      * @param shiftCodes
      * @return
@@ -106,31 +107,36 @@ public interface IAttendancePostRecordService {
     public List<AttendancePostRecord> selectCheckOutTimeByShiftCodes(Date today, List<String> shiftCodes);
 
     /**
-     *  获取当前时间下科长的在岗区域
+     * 获取当前时间下科长的在岗区域
+     *
      * @return 区域集合
      */
-    List<AttendancePostRecord> selectKezhangRecordCount(Long userId,Date startTime,Date endTime);
+    List<AttendancePostRecord> selectKezhangRecordCount(Long userId, Date startTime, Date endTime);
 
     /**
      * 获取当前时间下指定用户最后的在岗时间
+     *
      * @param userId 用户ID
      * @return 最后的在岗时间
      */
-    List<AttendancePostRecord>  queryLastTime(Long userId);
+    List<AttendancePostRecord> queryLastTime(Long userId);
 
     /**
      * 获取当前班次下科长上岗的id
+     *
      * @return
      */
     List<Long> queryKeIds();
+
     /**
      * 查询当前班组下所有在岗记录
      */
-    List<AttendancePostRecord>  selectTeamOnList(Date date, Long attendanceTeamId);
+    List<AttendancePostRecord> selectTeamOnList(Date date, Long attendanceTeamId);
 
     /**
      * 获取当前班次时间
-     * @return  时间
+     *
+     * @return 时间
      */
     Map<String, Date> getShiftTime();
 }

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

@@ -84,11 +84,12 @@ public interface IAttendanceRecordService {
 
     /**
      * 计算考勤日期
-     * @param checkInTime 实际打卡时间，即员工实际进行打卡操作的时间点
+     *
+     * @param checkInTime    实际打卡时间，即员工实际进行打卡操作的时间点
      * @param shiftStartTime 班次开始时间，格式为 "HH:mm"，如 "21:00" 表示晚上9点
-     * @param shiftEndTime 班次结束时间，格式为 "HH:mm"，如 "21:00" 表示晚上9点
-     * @param checkInType  1-上班打卡，2-下班打卡
+     * @param shiftEndTime   班次结束时间，格式为 "HH:mm"，如 "21:00" 表示晚上9点
+     * @param checkInType    1-上班打卡，2-下班打卡
      * @return 计算出的考勤日期，表示该次打卡记录应归属的考勤周期日期
      */
-    Date calculateAttendanceDate(Date checkInTime, String shiftStartTime, String shiftEndTime,String checkInType);
+    Date calculateAttendanceDate(Date checkInTime, String shiftStartTime, String shiftEndTime, String checkInType);
 }

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

@@ -2,19 +2,19 @@ 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 
-{
+public interface IAttendanceTeamUserRecordService {
     /**
      * 查询考勤班组成员
-     * 
+     *
      * @param userId 考勤班组成员主键
      * @return 考勤班组成员
      */
@@ -22,6 +22,7 @@ public interface IAttendanceTeamUserRecordService
 
     /**
      * 查询考勤班组成员列表
+     *
      * @param attendanceTeamUserRecord
      * @return
      */
@@ -30,7 +31,7 @@ public interface IAttendanceTeamUserRecordService
 
     /**
      * 上岗记录中查询考勤班组成员列表
-     * 
+     *
      * @param attendanceTeamUserRecord 考勤班组成员
      * @return 考勤班组成员集合
      */
@@ -38,7 +39,7 @@ public interface IAttendanceTeamUserRecordService
 
     /**
      * 新增考勤班组成员
-     * 
+     *
      * @param attendanceTeamUserRecord 考勤班组成员
      * @return 结果
      */
@@ -46,7 +47,7 @@ public interface IAttendanceTeamUserRecordService
 
     /**
      * 修改考勤班组成员
-     * 
+     *
      * @param attendanceTeamUserRecord 考勤班组成员
      * @return 结果
      */
@@ -54,7 +55,7 @@ public interface IAttendanceTeamUserRecordService
 
     /**
      * 批量删除考勤班组成员
-     * 
+     *
      * @param userIds 需要删除的考勤班组成员主键集合
      * @return 结果
      */
@@ -62,14 +63,15 @@ public interface IAttendanceTeamUserRecordService
 
     /**
      * 删除考勤班组成员信息
-     * 
+     *
      * @param userId 考勤班组成员主键
      * @return 结果
      */
     public int deleteAttendanceTeamUserRecordByUserId(Long userId);
 
     /**
-     *  批量新增考勤班组成员
+     * 批量新增考勤班组成员
+     *
      * @param attendanceTeamUserRecord
      * @return
      */

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

@@ -17,6 +17,7 @@ public class AttendanceAreaServiceImpl implements AttendanceAreaService {
 
     /**
      * 查询是否在考勤范围
+     *
      * @param lng 经度
      * @param lat 纬度
      * @return
@@ -43,6 +44,7 @@ public class AttendanceAreaServiceImpl implements AttendanceAreaService {
 
     /**
      * 查询所有的考勤范围点
+     *
      * @return
      */
     @Override

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

@@ -52,10 +52,10 @@ public class AttendancePostRecordServiceImpl implements IAttendancePostRecordSer
         }
         records = records.stream().map(record -> {
             //下通道时间是2001年1月1日00:00:00，所以这里要设置为null
-            if(record.getCheckOutTime() != null && record.getCheckOutTime().getTime() == 978352000000L){
+            if (record.getCheckOutTime() != null && record.getCheckOutTime().getTime() == 978352000000L) {
                 record.setCheckOutTime(null);
             }
-            if(record.getWorkDuration() !=null && record.getWorkDuration() < 0){
+            if (record.getWorkDuration() != null && record.getWorkDuration() < 0) {
                 record.setWorkDuration(0L);
             }
             return record;
@@ -113,7 +113,7 @@ public class AttendancePostRecordServiceImpl implements IAttendancePostRecordSer
      * 查询指定用户当天的上岗记录
      *
      * @param userId 用户ID
-     * @param today 当天日期
+     * @param today  当天日期
      * @return 上岗记录集合
      */
     @Override
@@ -124,7 +124,7 @@ public class AttendancePostRecordServiceImpl implements IAttendancePostRecordSer
     /**
      * 查询指定班次代码当天的上岗记录
      *
-     * @param today 当天日期
+     * @param today      当天日期
      * @param shiftCodes 班次代码列表
      * @return 上岗记录集合
      */
@@ -136,7 +136,7 @@ public class AttendancePostRecordServiceImpl implements IAttendancePostRecordSer
     /**
      * 根据指定时间获取用户的在岗位置信息
      *
-     * @param userId 用户ID
+     * @param userId    用户ID
      * @param queryTime 查询时间
      * @return 上岗记录集合
      */
@@ -149,16 +149,17 @@ public class AttendancePostRecordServiceImpl implements IAttendancePostRecordSer
      * 根据指定时间获取指定通道的在岗位置信息
      *
      * @param channelCodeList 通道code
-     * @param nowDate 查询时间
+     * @param nowDate         查询时间
      * @return 上岗记录集合
      */
     @Override
-    public List<AttendancePostRecord> selectLocationsByTimeAndChannelName(List<String> channelCodeList, Date nowDate,Date startTime,Date endTime) {
-        return attendancePostRecordMapper.selectLocationsByTimeAndChannelName(channelCodeList, nowDate,startTime,endTime);
+    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
@@ -170,10 +171,11 @@ public class AttendancePostRecordServiceImpl implements IAttendancePostRecordSer
 
     /**
      * 获取当前登录时间下科长的在岗区域
+     *
      * @return
      */
     @Override
-    public List<AttendancePostRecord> selectKezhangRecordCount(Long userId,Date startTime,Date endTime) {
+    public List<AttendancePostRecord> selectKezhangRecordCount(Long userId, Date startTime, Date endTime) {
         return attendancePostRecordMapper.selectKezhangRecordCount(userId, startTime, endTime);
     }
 
@@ -205,7 +207,7 @@ public class AttendancePostRecordServiceImpl implements IAttendancePostRecordSer
     public List<Long> queryKeIds() {
         Map<String, Date> shiftTime = getShiftTime();
         List<Long> longs = attendancePostRecordMapper.queryKeIds(shiftTime.get("start"), shiftTime.get("end"));
-        if(CollectionUtil.isNotEmpty(longs)){
+        if (CollectionUtil.isNotEmpty(longs)) {
             return longs.stream().distinct().collect(Collectors.toList());
         }
         return new ArrayList<>();
@@ -213,12 +215,13 @@ public class AttendancePostRecordServiceImpl implements IAttendancePostRecordSer
 
     @Override
     public List<AttendancePostRecord> selectTeamOnList(Date date, Long attendanceTeamId) {
-        return attendancePostRecordMapper.selectTeamOnList( date,  attendanceTeamId);
+        return attendancePostRecordMapper.selectTeamOnList(date, attendanceTeamId);
     }
 
     /**
-     *  获取当前班次周期的开始和结束时间
-     * @return  map  startTime:开始时间  endTime:结束时间
+     * 获取当前班次周期的开始和结束时间
+     *
+     * @return map  startTime:开始时间  endTime:结束时间
      */
     @Override
     public Map<String, Date> getShiftTime() {
@@ -265,5 +268,4 @@ public class AttendancePostRecordServiceImpl implements IAttendancePostRecordSer
     }
 
 
-
 }

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

@@ -135,19 +135,19 @@ public class AttendanceRecordServiceImpl implements IAttendanceRecordService {
     @Override
     public List<AttendanceCheckRecord> record(AttendanceRecordDTO dto, UserInfo userInfo) {
         //确定打卡时间
-        if(ObjectUtil.isNotEmpty(dto.getCheckInDate())){
+        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();
+        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)){
+            if (CollectionUtil.isNotEmpty(attendanceRecords)) {
                 AttendanceRecord lastRecord = attendanceRecords.get(0);
                 dto.setCheckInDate(lastRecord.getAttendanceDate());
             }
@@ -176,9 +176,9 @@ public class AttendanceRecordServiceImpl implements IAttendanceRecordService {
         if (StrUtil.equals("1", dto.getCheckInType())) {
             try {
                 ClockInEvent event = new ClockInEvent(
-                    this,
-                    userInfo.getUserId(),
-                    userInfo.getDepartmentId()
+                        this,
+                        userInfo.getUserId(),
+                        userInfo.getDepartmentId()
                 );
                 eventPublisher.publishEvent(event);
             } catch (Exception e) {
@@ -302,10 +302,10 @@ public class AttendanceRecordServiceImpl implements IAttendanceRecordService {
     /**
      * 根据实际打卡时间和班次时间计算所属考勤日期
      *
-     * @param checkInTime 实际打卡时间，即员工实际进行打卡操作的时间点
+     * @param checkInTime    实际打卡时间，即员工实际进行打卡操作的时间点
      * @param shiftStartTime 班次开始时间，格式为 "HH:mm"
-     * @param shiftEndTime 班次结束时间，格式为 "HH:mm"
-     * @param checkInType 打卡类型：1-上班打卡，2-下班打卡
+     * @param shiftEndTime   班次结束时间，格式为 "HH:mm"
+     * @param checkInType    打卡类型：1-上班打卡，2-下班打卡
      * @return 计算出的考勤日期，该次打卡记录应归属的考勤周期日期
      */
     public Date calculateAttendanceDate(Date checkInTime, String shiftStartTime, String shiftEndTime, String checkInType) {
@@ -358,12 +358,11 @@ public class AttendanceRecordServiceImpl implements IAttendanceRecordService {
     }
 
 
-
     /**
      * 处理梭班
      *
      * @param checkRecord 打卡记录
-     * @param userInfo 用户信息
+     * @param userInfo    用户信息
      */
     private void processShuttleShiftLogic(AttendanceCheckRecord checkRecord, UserInfo userInfo) {
         // 获取用户最近一次打卡记录
@@ -385,11 +384,10 @@ public class AttendanceRecordServiceImpl implements IAttendanceRecordService {
     }
 
 
-
     /**
      * 判断是否为梭班场景
      *
-     * @param lastRecord 最近打卡记录
+     * @param lastRecord    最近打卡记录
      * @param currentRecord 当前打卡记录
      * @return 是否为梭班场景
      */
@@ -412,7 +410,6 @@ public class AttendanceRecordServiceImpl implements IAttendanceRecordService {
     }
 
 
-
     /**
      * 获取用户最近一次打卡记录
      *
@@ -435,7 +432,6 @@ public class AttendanceRecordServiceImpl implements IAttendanceRecordService {
     }
 
 
-
     /**
      * 计算梭班场景下的次日考勤日期（基于上次考勤日期）
      *
@@ -481,9 +477,4 @@ public class AttendanceRecordServiceImpl implements IAttendanceRecordService {
     }
 
 
-
-
-
-
-
 }

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

@@ -24,13 +24,12 @@ import static com.sundot.airport.common.utils.SecurityUtils.getUsername;
 
 /**
  * 考勤班组成员Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2025-09-06
  */
 @Service
-public class AttendanceTeamUserRecordServiceImpl implements IAttendanceTeamUserRecordService 
-{
+public class AttendanceTeamUserRecordServiceImpl implements IAttendanceTeamUserRecordService {
     @Autowired
     private AttendanceTeamUserRecordMapper attendanceTeamUserRecordMapper;
 
@@ -42,13 +41,12 @@ public class AttendanceTeamUserRecordServiceImpl implements IAttendanceTeamUserR
 
     /**
      * 查询考勤班组成员
-     * 
+     *
      * @param userId 考勤班组成员主键
      * @return 考勤班组成员
      */
     @Override
-    public AttendanceTeamUserRecord selectAttendanceTeamUserRecordByUserId(Long userId, Date attendanceDate)
-    {
+    public AttendanceTeamUserRecord selectAttendanceTeamUserRecordByUserId(Long userId, Date attendanceDate) {
         return attendanceTeamUserRecordMapper.selectAttendanceTeamUserRecordByUserId(userId, attendanceDate);
     }
 
@@ -59,13 +57,12 @@ public class AttendanceTeamUserRecordServiceImpl implements IAttendanceTeamUserR
 
     /**
      * 上岗记录中查询考勤班组成员列表
-     * 
+     *
      * @param attendanceTeamUserRecord 考勤班组成员
      * @return 考勤班组成员
      */
     @Override
-    public List<AttendanceTeamUserRecord> selectAttendanceTeamUserRecordList(AttendanceTeamUserRecord attendanceTeamUserRecord)
-    {
+    public List<AttendanceTeamUserRecord> selectAttendanceTeamUserRecordList(AttendanceTeamUserRecord attendanceTeamUserRecord) {
         // 如果指定了考勤日期，则调整查询时间范围
         if (attendanceTeamUserRecord.getAttendanceDate() != null) {
             try {
@@ -94,56 +91,53 @@ public class AttendanceTeamUserRecordServiceImpl implements IAttendanceTeamUserR
 
     /**
      * 新增考勤班组成员
-     * 
+     *
      * @param attendanceTeamUserRecord 考勤班组成员
      * @return 结果
      */
     @Override
-    public int insertAttendanceTeamUserRecord(AttendanceTeamUserRecord attendanceTeamUserRecord)
-    {
+    public int insertAttendanceTeamUserRecord(AttendanceTeamUserRecord attendanceTeamUserRecord) {
         attendanceTeamUserRecord.setCreateTime(DateUtils.getNowDate());
         return attendanceTeamUserRecordMapper.insertAttendanceTeamUserRecord(attendanceTeamUserRecord);
     }
 
     /**
      * 修改考勤班组成员
-     * 
+     *
      * @param attendanceTeamUserRecord 考勤班组成员
      * @return 结果
      */
     @Override
-    public int updateAttendanceTeamUserRecord(AttendanceTeamUserRecord attendanceTeamUserRecord)
-    {
+    public int updateAttendanceTeamUserRecord(AttendanceTeamUserRecord attendanceTeamUserRecord) {
         attendanceTeamUserRecord.setUpdateTime(DateUtils.getNowDate());
         return attendanceTeamUserRecordMapper.updateAttendanceTeamUserRecord(attendanceTeamUserRecord);
     }
 
     /**
      * 批量删除考勤班组成员
-     * 
+     *
      * @param userIds 需要删除的考勤班组成员主键
      * @return 结果
      */
     @Override
-    public int deleteAttendanceTeamUserRecordByUserIds(Long[] userIds)
-    {
+    public int deleteAttendanceTeamUserRecordByUserIds(Long[] userIds) {
         return attendanceTeamUserRecordMapper.deleteAttendanceTeamUserRecordByUserIds(userIds);
     }
 
     /**
      * 删除考勤班组成员信息
-     * 
+     *
      * @param userId 考勤班组成员主键
      * @return 结果
      */
     @Override
-    public int deleteAttendanceTeamUserRecordByUserId(Long userId)
-    {
+    public int deleteAttendanceTeamUserRecordByUserId(Long userId) {
         return attendanceTeamUserRecordMapper.deleteAttendanceTeamUserRecordByUserId(userId);
     }
 
     /**
-     *  批量插入考勤班组成员
+     * 批量插入考勤班组成员
+     *
      * @param attendanceTeamUserRecord
      * @return
      */
@@ -153,10 +147,10 @@ public class AttendanceTeamUserRecordServiceImpl implements IAttendanceTeamUserR
         attendanceTeamUserRecord.forEach(record -> {
             record.setCreateTime(DateUtils.getNowDate());
             record.setCreateBy(getUsername());
-            if(Objects.isNull(record.getAttendanceDate())){
+            if (Objects.isNull(record.getAttendanceDate())) {
                 record.setAttendanceDate(DateUtils.getNowDate());
             }
-            if(Objects.isNull(record.getUserId())){
+            if (Objects.isNull(record.getUserId())) {
                 throw new ServiceException("用户id不能为空");
             }
 
@@ -186,7 +180,7 @@ public class AttendanceTeamUserRecordServiceImpl implements IAttendanceTeamUserR
                 }
             }
         });
-        if(userName.size()>0){
+        if (userName.size() > 0) {
             throw new ServiceException(StrUtil.format("用户{}在当前班次周期内已维护", JSONArray.toJSONString(userName)));
         }
         return attendanceTeamUserRecordMapper.insertAttendanceTeamUserRecordList(attendanceTeamUserRecord);
@@ -198,21 +192,21 @@ public class AttendanceTeamUserRecordServiceImpl implements IAttendanceTeamUserR
         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<>() ;
+        if (CollectionUtil.isEmpty(collect)) {
+            return new ArrayList<>();
         }
         List<Long> longs = userMapper.selectAttendanceTeamLeaderId(collect);
-        if(CollectionUtil.isEmpty(longs)){
+        if (CollectionUtil.isEmpty(longs)) {
             return new ArrayList<>();
         }
         return longs.stream().distinct().collect(Collectors.toList());
     }
 
 
-
     /**
      * 判断是否存在班次周期内的记录
-     * @param records 查询到的记录列表
+     *
+     * @param records    查询到的记录列表
      * @param targetDate 目标日期
      * @return 是否存在班次周期内的记录
      */
@@ -222,6 +216,7 @@ public class AttendanceTeamUserRecordServiceImpl implements IAttendanceTeamUserR
 
     /**
      * 判断指定日期是否在目标日期的班次周期内（当日7:00 - 次日7:00）
+     *
      * @param recordDate 记录日期
      * @param targetDate 目标日期
      * @return 是否在班次周期内
@@ -261,8 +256,8 @@ public class AttendanceTeamUserRecordServiceImpl implements IAttendanceTeamUserR
         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);
+            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) {

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

@@ -24,21 +24,34 @@
     </resultMap>
 
     <sql id="selectAttendanceCheckRecordVo">
-        select id, area_name, address, longitude, latitude, radius, status, create_time, update_time from attendance_area
+        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
+        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
+        WHERE status = 1
           AND longitude IS NOT NULL
           AND latitude IS NOT NULL
           AND longitude BETWEEN -180 AND 180
@@ -49,7 +62,7 @@
               ) BETWEEN 0 AND radius
     </select>
 
-    <select id="areaList"  resultMap="DistanceResultMap">
+    <select id="areaList" resultMap="DistanceResultMap">
         <include refid="selectAttendanceCheckRecordVo"/>
         WHERE
         status = 1

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

@@ -5,48 +5,66 @@
 <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"    />
+        <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
+        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">
+    <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="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>
+            <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>
@@ -56,7 +74,8 @@
         where id = #{id}
     </select>
 
-    <insert id="insertAttendanceCheckRecord" parameterType="AttendanceCheckRecord" useGeneratedKeys="true" keyProperty="id">
+    <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>
@@ -114,7 +133,9 @@
     </update>
 
     <delete id="deleteAttendanceCheckRecordById" parameterType="Long">
-        delete from attendance_check_record where id = #{id}
+        delete
+        from attendance_check_record
+        where id = #{id}
     </delete>
 
     <delete id="deleteAttendanceCheckRecordByIds" parameterType="String">

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

@@ -1,67 +1,97 @@
 <?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">
+        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"    />
+        <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
+        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>
+        <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>
+            <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}
@@ -92,7 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="tenantId != null">#{tenantId},</if>
             <if test="revision != null">#{revision},</if>
@@ -116,7 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="attendanceDate != null">#{attendanceDate},</if>
             <if test="overDuration != null">#{overDuration},</if>
             <if test="statusDesc != null and statusDesc != ''">#{statusDesc},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateAttendanceRecord" parameterType="AttendanceRecord">
@@ -149,11 +179,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteAttendanceRecordById" parameterType="Long">
-        delete from attendance_record where id = #{id}
+        delete
+        from attendance_record
+        where id = #{id}
     </delete>
 
     <delete id="deleteAttendanceRecordByIds" parameterType="String">
-        delete from attendance_record where id in 
+        delete from attendance_record where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

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

@@ -1,51 +1,69 @@
 <?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">
+        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"    />
+        <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
+        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">
+    <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>
+        <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>
+            <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">
+
+    <select id="selectAttendanceTeamUserRecordByUserId" resultMap="AttendanceTeamUserRecordResult">
         <include refid="selectAttendanceTeamUserRecordVo"/>
         where user_id = #{userId}
-         and DATE(attendance_date) = DATE(#{attendanceDate})
+        and DATE(attendance_date) = DATE(#{attendanceDate})
     </select>
 
     <insert id="insertAttendanceTeamUserRecord" parameterType="AttendanceTeamUserRecord">
@@ -64,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="userId != null">#{userId},</if>
             <if test="userCode != null and userCode != ''">#{userCode},</if>
@@ -79,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateAttendanceTeamUserRecord" parameterType="AttendanceTeamUserRecord">
@@ -102,11 +120,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteAttendanceTeamUserRecordByUserId" parameterType="Long">
-        delete from attendance_team_user_record where user_id = #{userId}
+        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 
+        delete from attendance_team_user_record where user_id in
         <foreach item="userId" collection="array" open="(" separator="," close=")">
             #{userId}
         </foreach>
@@ -125,14 +145,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </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
+        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}
+          AND attendance_date >= #{startDate}
+          AND attendance_date &lt;= #{endDate}
     </select>