fix(wms/attendance): 统一考勤查询时间字段格式为完整时分秒
将WmsAttendanceCheckVo中所有时间字段的@JsonFormat注解从"yyyy-MM-dd HH:mm"改为"yyyy-MM-dd HH:mm:ss",确保前后端时间数据格式一致,避免因秒数缺失导致的解析或显示问题。
This commit is contained in:
@@ -26,13 +26,13 @@ public class WmsAttendanceCheckVo {
|
|||||||
@ExcelProperty(value = "班次")
|
@ExcelProperty(value = "班次")
|
||||||
private String shiftName;
|
private String shiftName;
|
||||||
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
private Date p1StartTime;
|
private Date p1StartTime;
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
private Date p1EndTime;
|
private Date p1EndTime;
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
private Date p1FirstCheck;
|
private Date p1FirstCheck;
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
private Date p1LastCheck;
|
private Date p1LastCheck;
|
||||||
@ExcelProperty(value = "上午迟到(分钟)")
|
@ExcelProperty(value = "上午迟到(分钟)")
|
||||||
private Integer p1LateMinutes;
|
private Integer p1LateMinutes;
|
||||||
@@ -43,13 +43,13 @@ public class WmsAttendanceCheckVo {
|
|||||||
@ExcelProperty(value = "上午扣款")
|
@ExcelProperty(value = "上午扣款")
|
||||||
private BigDecimal p1Deduct;
|
private BigDecimal p1Deduct;
|
||||||
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
private Date p2StartTime;
|
private Date p2StartTime;
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
private Date p2EndTime;
|
private Date p2EndTime;
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
private Date p2FirstCheck;
|
private Date p2FirstCheck;
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
private Date p2LastCheck;
|
private Date p2LastCheck;
|
||||||
@ExcelProperty(value = "下午迟到(分钟)")
|
@ExcelProperty(value = "下午迟到(分钟)")
|
||||||
private Integer p2LateMinutes;
|
private Integer p2LateMinutes;
|
||||||
|
|||||||
Reference in New Issue
Block a user