From a61a8a3715affc52872e9e34922cd2a1501781ed Mon Sep 17 00:00:00 2001 From: fl <3098731433@qq.com> Date: Thu, 23 Jan 2025 09:18:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=80=83=E5=8B=A4=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=8D=E8=83=BD=E8=B6=85=E8=BF=87=E5=BD=93=E5=A4=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/att/service/AttendanceDetailsServiceImpl.java | 4 ++++ .../src/main/java/com/bonus/system/att/tasks/AttTasks.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttendanceDetailsServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttendanceDetailsServiceImpl.java index 1b41cd5..c3f9594 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttendanceDetailsServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttendanceDetailsServiceImpl.java @@ -199,6 +199,10 @@ public class AttendanceDetailsServiceImpl implements AttendanceDetailsService { public AjaxResult synchronous(AttDataDetailsBean bean) { try { List dateList = attTasks.getStrDateListBetween(bean.getStartDate(), bean.getEndDate()); + //只执行今天之前的时间（包含今天） + dateList = dateList.stream() + .filter(date -> attTasks.isBeforeToday(date)) + .collect(Collectors.toList()); attTasks.hisAttPush(dateList); return AjaxResult.success("数据同步成功"); }catch (Exception e){ diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/AttTasks.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/AttTasks.java index e0c2697..ca2a780 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/AttTasks.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/AttTasks.java @@ -538,7 +538,7 @@ public class AttTasks { * @param dateStr 传入的日期字符串，格式为 "yyyy-MM-dd" * @return 如果传入的日期在今天的日期之前，返回 true；否则返回 false */ - private boolean isBeforeToday(String dateStr) { + public boolean isBeforeToday(String dateStr) { if (dateStr == null || dateStr.isEmpty()) { return false; }