From 2d868cd5c0a65974751b68de6765ec5230874fa5 Mon Sep 17 00:00:00 2001 From: fl <3098731433@qq.com> Date: Thu, 23 Jan 2025 14:57:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=80=83=E5=8B=A4?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/att/AttSourceDataMapper.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/att/AttSourceDataMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/att/AttSourceDataMapper.xml index 91a9797..4479aeb 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/att/AttSourceDataMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/att/AttSourceDataMapper.xml @@ -296,7 +296,6 @@ SELECT count(0) FROM att_data WHERE user_id = #{userId} - and org_id = #{orgId} and att_type = #{attType} and att_current_day = #{attCurrentDay} @@ -305,7 +304,6 @@ SELECT count(0) FROM att_data_update WHERE user_id = #{userId} - and org_id = #{orgId} and att_type = #{attType} and att_current_day = #{attCurrentDay} From e315ab5d5d1145a2782705f9a58a3e8f12628145 Mon Sep 17 00:00:00 2001 From: fl <3098731433@qq.com> Date: Thu, 23 Jan 2025 16:58:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=80=83=E5=8B=A4?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../att/service/AttendanceDetailsServiceImpl.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) 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 a1920bf..38e36c0 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 @@ -22,6 +22,8 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; @@ -198,10 +200,17 @@ public class AttendanceDetailsServiceImpl implements AttendanceDetailsService { @Override public AjaxResult synchronous(AttDataDetailsBean bean) { try { - List dateList = attTasks.getStrDateListBetween(bean.getStartDate(), bean.getEndDate()); + List dateList = AttTasks.getStrDateListBetween(bean.getStartDate(), bean.getEndDate()); //只执行今天之前的时间（包含今天） + // 获取今天的日期 + LocalDate today = LocalDate.now(); + // 定义日期格式 + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); dateList = dateList.stream() - .filter(date -> attTasks.isBeforeToday(date)) + .map(date -> LocalDate.parse(date, formatter)) // 将字符串转换为LocalDate + .filter(date -> !date.isAfter(today)) // 筛选出今天及之前的日期 + .sorted() // 按日期排序（可选） + .map(formatter::format) // 将LocalDate转回为字符串 .collect(Collectors.toList()); attTasks.hisAttPush(dateList); return AjaxResult.success("数据同步成功");