From f0253bd9adf3701b343ededb91e297075dbe4e9d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 11 二月 2026 12:00:26 +0800
Subject: [PATCH] 人员打卡签到字段类型调整
---
src/main/java/com/ruoyi/staff/service/impl/PersonalAttendanceRecordsServiceImpl.java | 9 +++++----
src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java | 12 +++++++++++-
src/main/java/com/ruoyi/staff/pojo/PersonalAttendanceLocationConfig.java | 5 +++--
src/main/java/com/ruoyi/staff/dto/PersonalAttendanceRecordsDto.java | 5 +++--
4 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java b/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java
index d55ec63..5eabe99 100644
--- a/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java
+++ b/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java
@@ -10,7 +10,10 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* <p>
@@ -34,10 +37,17 @@
return R.ok(personalAttendanceLocationConfigService.saveOrUpdate(personalAttendanceLocationConfig));
}
- @ApiOperation("鍒嗛〉鏌ヨ鎵撳崱绛惧埌")
+ @ApiOperation("鍒嗛〉鏌ヨ浜哄憳鎵撳崱瑙勫垯閰嶇疆")
@GetMapping("/listPage")
public R listPage(Page page){
return R.ok(personalAttendanceLocationConfigService.page(page));
}
+
+ @ApiOperation("鍒犻櫎浜哄憳鎵撳崱瑙勫垯閰嶇疆")
+ @DeleteMapping("/del")
+ public R del(@RequestBody List<Integer> ids) {
+ return R.ok(personalAttendanceLocationConfigService.removeBatchByIds(ids));
+ }
+
}
diff --git a/src/main/java/com/ruoyi/staff/dto/PersonalAttendanceRecordsDto.java b/src/main/java/com/ruoyi/staff/dto/PersonalAttendanceRecordsDto.java
index 7da7e54..511390c 100644
--- a/src/main/java/com/ruoyi/staff/dto/PersonalAttendanceRecordsDto.java
+++ b/src/main/java/com/ruoyi/staff/dto/PersonalAttendanceRecordsDto.java
@@ -9,6 +9,7 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
+import java.time.LocalTime;
@Data
@ExcelIgnoreUnannotated
@@ -33,10 +34,10 @@
//鏍囧噯涓婄彮鏃堕棿
@JsonFormat(pattern = "HH:mm")
@DateTimeFormat(pattern = "HH:mm")
- private LocalDateTime startAt;
+ private LocalTime startAt;
//鏍囧噯涓嬬彮鏃堕棿
@JsonFormat(pattern = "HH:mm")
@DateTimeFormat(pattern = "HH:mm")
- private LocalDateTime endAt;
+ private LocalTime endAt;
}
diff --git a/src/main/java/com/ruoyi/staff/pojo/PersonalAttendanceLocationConfig.java b/src/main/java/com/ruoyi/staff/pojo/PersonalAttendanceLocationConfig.java
index 2c27a17..3b677e1 100644
--- a/src/main/java/com/ruoyi/staff/pojo/PersonalAttendanceLocationConfig.java
+++ b/src/main/java/com/ruoyi/staff/pojo/PersonalAttendanceLocationConfig.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.time.LocalTime;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
@@ -50,10 +51,10 @@
@ApiModelProperty("涓婄彮鏃堕棿")
@JsonFormat(pattern = "HH:mm")
@DateTimeFormat(pattern = "HH:mm")
- private LocalDateTime startAt;
+ private LocalTime startAt;
@ApiModelProperty("涓嬬彮鏃堕棿")
@JsonFormat(pattern = "HH:mm")
@DateTimeFormat(pattern = "HH:mm")
- private LocalDateTime endAt;
+ private LocalTime endAt;
}
diff --git a/src/main/java/com/ruoyi/staff/service/impl/PersonalAttendanceRecordsServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/PersonalAttendanceRecordsServiceImpl.java
index 8b2a7d2..7897d72 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/PersonalAttendanceRecordsServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/PersonalAttendanceRecordsServiceImpl.java
@@ -33,6 +33,7 @@
import java.math.RoundingMode;
import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
@@ -98,7 +99,7 @@
throw new BaseException(String.format("鎵撳崱澶辫触锛氭偍褰撳墠浣嶇疆璺濈鑰冨嫟鐐�%.2f绫筹紝瓒呭嚭鍏佽鑼冨洿锛�%s绫筹級", actualDistance, allowedRadius));
}
/*鍒ゆ柇鎵撳崱鏃堕棿*/
- LocalDateTime endAt = locationConfig.getEndAt(); //涓嬬彮鏃堕棿
+ LocalTime endAt = locationConfig.getEndAt(); //涓嬬彮鏃堕棿
// 鑾峰彇鑰冨嫟涓嬬彮鏃堕棿鐐�
int standardHour = endAt.getHour();
int standardMinute = endAt.getMinute();
@@ -153,9 +154,9 @@
LocalDateTime actualTime = isStart ? attendanceRecord.getWorkStartAt() : attendanceRecord.getWorkEndAt();
try {
// 鑾峰彇鑰冨嫟鏃堕棿閰嶇疆
- LocalDateTime startAt = locationConfig.getStartAt();//涓婄彮鏃堕棿
- LocalDateTime endAt = locationConfig.getEndAt();//涓嬬彮鏃堕棿
- LocalDateTime timeConfig = isStart ? startAt : endAt;
+ LocalTime startAt = locationConfig.getStartAt();//涓婄彮鏃堕棿
+ LocalTime endAt = locationConfig.getEndAt();//涓嬬彮鏃堕棿
+ LocalTime timeConfig = isStart ? startAt : endAt;
// 瑙ｆ瀽灏忔椂鍜屽垎閽�
int standardHour = timeConfig.getHour();
int standardMinute = timeConfig.getMinute();
--
Gitblit v1.9.3