DeXun/klp-oa
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X

Browse Source
This commit is contained in:
砂糖
2026-05-15 18:14:45 +08:00
parent 47708a3cbf 41a31e7568
commit 74916a7ed1
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
klp-wms/src/main/java/com/klp/domain/WmsAttendanceCheck.java
View File

@@ -49,6 +49,5 @@ public class WmsAttendanceCheck extends BaseEntity {
private String overallStatus; private String overallStatus;
private String remark; private String remark;
@TableLogic
private Integer delFlag; private Integer delFlag;
} }

8
klp-wms/src/main/java/com/klp/domain/vo/WmsAttendanceCheckVo.java
View File

@@ -26,9 +26,9 @@ public class WmsAttendanceCheckVo {
@ExcelProperty(value = "班次") @ExcelProperty(value = "班次")
private String shiftName; private String shiftName;
@JsonFormat(pattern = "HH:mm") @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
private Date p1StartTime; private Date p1StartTime;
@JsonFormat(pattern = "HH:mm") @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
private Date p1EndTime; private Date p1EndTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm") @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
private Date p1FirstCheck; private Date p1FirstCheck;
@@ -43,9 +43,9 @@ public class WmsAttendanceCheckVo {
@ExcelProperty(value = "上午扣款") @ExcelProperty(value = "上午扣款")
private BigDecimal p1Deduct; private BigDecimal p1Deduct;
@JsonFormat(pattern = "HH:mm") @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
private Date p2StartTime; private Date p2StartTime;
@JsonFormat(pattern = "HH:mm") @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
private Date p2EndTime; private Date p2EndTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm") @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
private Date p2FirstCheck; private Date p2FirstCheck;

8
klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java
View File

@@ -227,7 +227,9 @@ public class WmsAttendanceCheckServiceImpl implements IWmsAttendanceCheckService
return new ArrayList<>(); return new ArrayList<>();
} }
LocalDate ld = toLocalDate(workDate); LocalDate ld = toLocalDate(workDate);
LocalDateTime rangeStart = ld.atStartOfDay(); LocalDateTime rangeStart = backward
? ld.minusDays(1).atStartOfDay()
: ld.atStartOfDay();
LocalDateTime rangeEnd = crossDay && !backward LocalDateTime rangeEnd = crossDay && !backward
? ld.plusDays(1).atTime(LocalTime.of(23, 59, 59)) ? ld.plusDays(1).atTime(LocalTime.of(23, 59, 59))
: ld.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; boolean backward = crossDay && et != null && et.getHour() >= 12;
if (crossDay && backward) { 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); windowEnd = LocalDateTime.of(ld, et).plusHours(2);
} else if (crossDay) { } else if (crossDay) {
windowStart = LocalDateTime.of(ld, st).minusHours(2); windowStart = LocalDateTime.of(ld, st).minusHours(2);