diff --git a/klp-wms/src/main/java/com/klp/domain/WmsAttendanceCheck.java b/klp-wms/src/main/java/com/klp/domain/WmsAttendanceCheck.java index 4a7e58d1..f02c7df2 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsAttendanceCheck.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsAttendanceCheck.java @@ -49,6 +49,5 @@ public class WmsAttendanceCheck extends BaseEntity { private String overallStatus; private String remark; - @TableLogic private Integer delFlag; } diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsAttendanceCheckVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsAttendanceCheckVo.java index e9adc685..3ce099b7 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsAttendanceCheckVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsAttendanceCheckVo.java @@ -26,9 +26,9 @@ public class WmsAttendanceCheckVo { @ExcelProperty(value = "班次") private String shiftName; - @JsonFormat(pattern = "HH:mm") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") private Date p1StartTime; - @JsonFormat(pattern = "HH:mm") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") private Date p1EndTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm") private Date p1FirstCheck; @@ -43,9 +43,9 @@ public class WmsAttendanceCheckVo { @ExcelProperty(value = "上午扣款") private BigDecimal p1Deduct; - @JsonFormat(pattern = "HH:mm") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") private Date p2StartTime; - @JsonFormat(pattern = "HH:mm") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") private Date p2EndTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm") private Date p2FirstCheck; diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java index 33a4673f..766c2b85 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java @@ -227,7 +227,9 @@ public class WmsAttendanceCheckServiceImpl implements IWmsAttendanceCheckService return new ArrayList<>(); } LocalDate ld = toLocalDate(workDate); - LocalDateTime rangeStart = ld.atStartOfDay(); + LocalDateTime rangeStart = backward + ? ld.minusDays(1).atStartOfDay() + : ld.atStartOfDay(); LocalDateTime rangeEnd = crossDay && !backward ? ld.plusDays(1).atTime(LocalTime.of(23, 59, 59)) : ld.atTime(LocalTime.of(23, 59, 59)); @@ -329,7 +331,9 @@ public class WmsAttendanceCheckServiceImpl implements IWmsAttendanceCheckService boolean backward = crossDay && et != null && et.getHour() >= 12; if (crossDay && backward) { - windowStart = LocalDateTime.of(ld, et).minusHours(2); + windowStart = st != null + ? LocalDateTime.of(ld.minusDays(1), st).minusHours(2) + : LocalDateTime.of(ld, et).minusHours(2); windowEnd = LocalDateTime.of(ld, et).plusHours(2); } else if (crossDay) { windowStart = LocalDateTime.of(ld, st).minusHours(2);