by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

时间格式化问题

Browse Source
This commit is contained in:
dy 2025-07-21 10:04:56 +08:00
parent f24df2e494
commit 34d7b40645
4 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pom.xml
View File

@ -93,6 +93,8 @@
<profiles.active>dev</profiles.active>
<nacos.server>192.168.24.101:8848</nacos.server>
<logstash.address>192.168.24.101:4560</logstash.address>
<!-- <nacos.server>192.168.1.3:8848</nacos.server>-->
<!-- <logstash.address>192.168.1.3:4560</logstash.address>-->
<nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
<nacos.config.group>DEFAULT_GROUP</nacos.config.group>
<nacos.username>nacos</nacos.username>
@ -367,17 +369,17 @@
<version>${mapstruct-plus.version}</version>
</dependency>
<dependency>
<groupId>com.hik</groupId>
<artifactId>examples</artifactId>
<version>${hik-sdk.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.hik</groupId>-->
<!-- <artifactId>examples</artifactId>-->
<!-- <version>${hik-sdk.version}</version>-->
<!-- </dependency>-->
<dependency>
<groupId>com.hik</groupId>
<artifactId>jna</artifactId>
<version>${hik-sdk.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.hik</groupId>-->
<!-- <artifactId>jna</artifactId>-->
<!-- <version>${hik-sdk.version}</version>-->
<!-- </dependency>-->
<!--消息队列-->
<dependency>

8
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceShift.java
View File

@ -41,12 +41,12 @@ public class AttendanceShift extends TenantEntity {
/**
* 考勤开始时间
*/
private DateTime startTime;
private LocalTime startTime;
/**
* 考勤结束时间
*/
private DateTime endTime;
private LocalTime endTime;
/**
* 状态（0：off，1：on）
@ -61,12 +61,12 @@ public class AttendanceShift extends TenantEntity {
/**
* 休息开始时间
*/
private DateTime restStartTime;
private LocalTime restStartTime;
/**
* 休息结束时间
*/
private DateTime restEndTime;
private LocalTime restEndTime;
}

8
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceShiftBo.java
View File

@ -42,13 +42,13 @@ public class AttendanceShiftBo extends BaseEntity {
* 考勤开始时间
*/
@DateTimeFormat(pattern = "HH:mm:ss")
private DateTime startTime;
private LocalTime startTime;
/**
* 考勤结束时间
*/
@DateTimeFormat(pattern = "HH:mm:ss")
private DateTime endTime;
private LocalTime endTime;
/**
* 状态（0：off，1：on）
@ -64,13 +64,13 @@ public class AttendanceShiftBo extends BaseEntity {
* 休息开始时间
*/
@DateTimeFormat(pattern = "HH:mm:ss")
private DateTime restStartTime;
private LocalTime restStartTime;
/**
* 休息结束时间
*/
@DateTimeFormat(pattern = "HH:mm:ss")
private DateTime restEndTime;
private LocalTime restEndTime;
}

8
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceShiftVo.java
View File

@ -49,13 +49,13 @@ public class AttendanceShiftVo implements Serializable {
* 考勤开始时间
*/
@ExcelProperty(value = "考勤开始时间")
private DateTime startTime;
private LocalTime startTime;
/**
* 考勤结束时间
*/
@ExcelProperty(value = "考勤结束时间")
private DateTime endTime;
private LocalTime endTime;
/**
* 状态（0：off，1：on）
@ -75,13 +75,13 @@ public class AttendanceShiftVo implements Serializable {
* 休息开始时间
*/
@ExcelProperty(value = "休息开始时间")
private DateTime restStartTime;
private LocalTime restStartTime;
/**
* 休息结束时间
*/
@ExcelProperty(value = "休息结束时间")
private DateTime restEndTime;
private LocalTime restEndTime;
}